Skip to content

Y
ygopro-2pick
Commit 35a443e9 authored by nanahira's avatar nanahira
Browse files
Options

fixmerge

parent 263ca88a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
gframe/game.h
View file @ 35a443e9
...@@ -46,14 +46,11 @@ struct Config { ...@@ -46,14 +46,11 @@ struct Config {
int defaultOT; int defaultOT;
int enable_bot_mode; int enable_bot_mode;
int quick_animation; int quick_animation;
<<<<<<< HEAD
bool window_maximized; bool window_maximized;
int window_width; int window_width;
int window_height; int window_height;
bool resize_popup_menu; bool resize_popup_menu;
=======
int auto_save_replay; int auto_save_replay;
>>>>>>> a5ab7da15d69d9d2f622551c053ae64081f9e1d4
bool enable_sound; bool enable_sound;
bool enable_music; bool enable_music;
double sound_volume; double sound_volume;
...@@ -296,13 +293,10 @@ public: ...@@ -296,13 +293,10 @@ public:
irr::gui::IGUICheckBox* chkAutoChain; irr::gui::IGUICheckBox* chkAutoChain;
irr::gui::IGUICheckBox* chkWaitChain; irr::gui::IGUICheckBox* chkWaitChain;
irr::gui::IGUICheckBox* chkQuickAnimation; irr::gui::IGUICheckBox* chkQuickAnimation;
<<<<<<< HEAD irr::gui::IGUICheckBox* chkAutoSaveReplay;
irr::gui::IGUIWindow* tabSystem; irr::gui::IGUIWindow* tabSystem;
irr::gui::IGUIElement* elmTabSystemLast; irr::gui::IGUIElement* elmTabSystemLast;
irr::gui::IGUIScrollBar* scrTabSystem; irr::gui::IGUIScrollBar* scrTabSystem;
=======
irr::gui::IGUICheckBox* chkAutoSaveReplay;
>>>>>>> a5ab7da15d69d9d2f622551c053ae64081f9e1d4
irr::gui::IGUICheckBox* chkHideSetname; irr::gui::IGUICheckBox* chkHideSetname;
irr::gui::IGUICheckBox* chkHideHintButton; irr::gui::IGUICheckBox* chkHideHintButton;
irr::gui::IGUICheckBox* chkIgnoreDeckChanges; irr::gui::IGUICheckBox* chkIgnoreDeckChanges;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment