0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert 2007-12-22T11:38:26Z!koraq@xs4all.nl

Browse source 
(causes t_string and color_range undefined class when compiling other
files, such as button.cpp)

- also fix a bool / long warning

- remove wassert from MSVC project file
This commit is contained in:
Patrick Parker 2007-12-22 21:25:08 +00:00
parent b329535ef7
commit edafdc4435
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_config.cpp
View file

@ -14,14 +14,12 @@
#include "global.hpp"
#include "color_range.hpp"
#include "config.hpp"
#include "log.hpp"
#include "gettext.hpp"
#include "game_config.hpp"
#include "util.hpp"
#include "serialization/string_utils.hpp"
#include "tstring.hpp"
#include "wesconfig.h"
#include <cstdlib>

5
src/game_config.hpp
View file

@ -14,11 +14,10 @@
#ifndef GAME_CONFIG_H_INCLUDED
#define GAME_CONFIG_H_INCLUDED
class color_range;
class config;
class t_string;
#include "SDL_types.h"
#include "color_range.hpp"
#include "tstring.hpp"
#include <string>
#include <vector>

2
src/play_controller.cpp
View file

@ -699,7 +699,7 @@ void play_controller::play_slice()
}
int mousex, mousey;
bool middle_pressed = SDL_GetMouseState(&mousex,&mousey)& SDL_BUTTON(2);
bool middle_pressed = (SDL_GetMouseState(&mousex,&mousey)& SDL_BUTTON(2)) != 0;
tooltips::process(mousex, mousey);
const int scroll_threshold = (preferences::mouse_scroll_enabled()) ? 5 : 0;

10
wesnoth.dsp
View file

@ -81,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"wesnoth.exe" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib zdll.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/wesnoth.pdb" /debug /machine:I386 /out:"wesnoth.exe" /pdbtype:sept /libpath:"c:\projects\wesnoth\yogilib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib zdll.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/wesnoth.pdb" /debug /machine:I386 /out:"wesnoth.exe" /pdbtype:sept /libpath:"c:\projects\wesnoth\yogilib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
@ -603,6 +603,10 @@ SOURCE=.\src\widgets\widget.cpp
# End Source File
# Begin Source File
SOURCE=.\src\wml_exception.cpp
# End Source File
# Begin Source File
SOURCE=..\boost_1_34_1\libs\iostreams\src\zlib.cpp
# End Source File
# End Group
@ -1131,6 +1135,10 @@ SOURCE=.\src\widgets\widget.hpp
# End Source File
# Begin Source File
SOURCE=.\src\wml_exception.hpp
# End Source File
# Begin Source File
SOURCE=.\src\wml_separators.hpp
# End Source File
# End Group