eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary calls

This commit is contained in:
Alexander Batalov 2023-02-17 15:53:42 +03:00
parent d7c4589a55
commit 1570f860e8
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/preferences.cc
View File

@ -6,7 +6,6 @@
#include "color.h" #include "color.h"
#include "combat.h" #include "combat.h"
#include "combat_ai.h" #include "combat_ai.h"
#include "cycle.h"
#include "debug.h" #include "debug.h"
#include "draw.h" #include "draw.h"
#include "game.h" #include "game.h"
@ -15,7 +14,6 @@
#include "graph_lib.h" #include "graph_lib.h"
#include "input.h" #include "input.h"
#include "kb.h" #include "kb.h"
#include "map.h"
#include "message.h" #include "message.h"
#include "mouse.h" #include "mouse.h"
#include "palette.h" #include "palette.h"
@ -392,9 +390,6 @@ static PreferenceDescription gPreferenceDescriptions[PREF_COUNT] = {
static FrmImage _preferencesFrmImages[PREFERENCES_WINDOW_FRM_COUNT]; static FrmImage _preferencesFrmImages[PREFERENCES_WINDOW_FRM_COUNT];
static int _oldFont; static int _oldFont;
static bool _cycleWasEnabled;
static bool _isoWasEnabled;
static bool _mouseWasVisible;
int preferencesInit() int preferencesInit()
{ {
@ -981,22 +976,8 @@ static int preferencesWindowInit()
return -1; return -1;
} }
gameMouseSetCursor(MOUSE_CURSOR_ARROW);
_oldFont = fontGetCurrent(); _oldFont = fontGetCurrent();
_isoWasEnabled = isoDisable();
_cycleWasEnabled = colorCycleEnabled();
if (_cycleWasEnabled) {
colorCycleDisable();
}
_mouseWasVisible = gameMouseObjectsIsVisible();
if (_mouseWasVisible) {
gameMouseObjectsHide();
}
_SaveSettings(); _SaveSettings();
for (i = 0; i < PREFERENCES_WINDOW_FRM_COUNT; i++) { for (i = 0; i < PREFERENCES_WINDOW_FRM_COUNT; i++) {
@ -1210,18 +1191,6 @@ static int preferencesWindowFree()
_preferencesFrmImages[index].unlock(); _preferencesFrmImages[index].unlock();
} }
if (_mouseWasVisible) {
gameMouseObjectsShow();
}
if (_cycleWasEnabled) {
colorCycleEnable();
}
if (_isoWasEnabled) {
isoEnable();
}
fontSetCurrent(_oldFont); fontSetCurrent(_oldFont);
messageListFree(&gPreferencesMessageList); messageListFree(&gPreferencesMessageList);