games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

* next ubuntux's patches

Browse Source
This commit is contained in:
mateuszb 2009-04-14 10:46:42 +00:00
parent 4d3808cfa0
commit 049b4de2b2
8 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AI/EmptyAI/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
pkglib_LTLIBRARIES = EmptyAI.la
EmptyAI_la_LIBADD = $(top_builddir)/lib/libvcmi.a $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
EmptyAI_la_LDFLAGS = -L$(top_builddir)/lib -module
EmptyAI_la_SOURCES = \
CEmptyAI.cpp \
CEmptyAI.h \
exp_funcs.cpp

2
AI/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = GeniusAI SUBDIRS = EmptyAI GeniusAI

4
CAdvmapInterface.h
View File

@ -121,6 +121,9 @@ public:
SDL_Surface * bg; SDL_Surface * bg;
CStatusBar statusbar;
AdventureMapButton kingOverview,//- kingdom overview AdventureMapButton kingOverview,//- kingdom overview
underground,//- underground switch underground,//- underground switch
questlog,//- questlog questlog,//- questlog
@ -135,7 +138,6 @@ public:
CTerrainRect terrain; //visible terrain CTerrainRect terrain; //visible terrain
CStatusBar statusbar;
CResDataBar resdatabar; CResDataBar resdatabar;
CHeroList heroList; CHeroList heroList;

5
CMT.cpp
View File

@ -196,8 +196,9 @@ int main(int argc, char** argv)
while(1) //main SDL events loop while(1) //main SDL events loop
{ {
ev = new SDL_Event(); ev = new SDL_Event();
SDL_WaitEvent(ev);
if((ev->type==SDL_QUIT) || (ev->type == SDL_KEYDOWN && ev->key.keysym.sym==SDLK_F4 && (ev->key.keysym.mod & KMOD_ALT))) int ret = SDL_WaitEvent(ev);
if(ret == 0 || (ev->type==SDL_QUIT) || (ev->type == SDL_KEYDOWN && ev->key.keysym.sym==SDLK_F4 && (ev->key.keysym.mod & KMOD_ALT)))
{ {
LOCPLINT->pim->lock(); LOCPLINT->pim->lock();
cl.close(); cl.close();

4
CPlayerInterface.h
View File

@ -415,8 +415,8 @@ public:
class CCustomImgComponent : public SComponent class CCustomImgComponent : public SComponent
{ {
public: public:
bool free; //should surface be freed on delete
SDL_Surface *bmp; //our image SDL_Surface *bmp; //our image
bool free; //should surface be freed on delete
SDL_Surface * getImg(); SDL_Surface * getImg();
CCustomImgComponent(Etype Type, int Subtype, int Val, SDL_Surface *sur, bool freeSur); //c-tor CCustomImgComponent(Etype Type, int Subtype, int Val, SDL_Surface *sur, bool freeSur); //c-tor
~CCustomImgComponent(); //d-tor ~CCustomImgComponent(); //d-tor
@ -686,8 +686,8 @@ public:
class CCreaturePic //draws picture with creature on background, use nextFrame=true to get animation class CCreaturePic //draws picture with creature on background, use nextFrame=true to get animation
{ {
public: public:
bool big; //big => 100x130; !big => 100x120
CCreature *c; //which creature's picture CCreature *c; //which creature's picture
bool big; //big => 100x130; !big => 100x120
CCreatureAnimation *anim; //displayed animation CCreatureAnimation *anim; //displayed animation
CCreaturePic(CCreature *cre, bool Big=true); //c-tor CCreaturePic(CCreature *cre, bool Big=true); //c-tor
~CCreaturePic(); //d-tor ~CCreaturePic(); //d-tor

3
configure.ac
View File

@ -8,7 +8,6 @@ AC_CONFIG_HEADER([config.h])
# Checks for programs. # Checks for programs.
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CXX
AC_PROG_CC AC_PROG_CC
AX_BOOST_BASE([1.37]) AX_BOOST_BASE([1.37])
AX_BOOST_SYSTEM AX_BOOST_SYSTEM
@ -64,4 +63,4 @@ AC_FUNC_MALLOC
AC_FUNC_SELECT_ARGTYPES AC_FUNC_SELECT_ARGTYPES
AC_CHECK_FUNCS([atexit memset pow select sqrt]) AC_CHECK_FUNCS([atexit memset pow select sqrt])
AC_OUTPUT(Makefile lib/Makefile client/Makefile server/Makefile AI/Makefile AI/GeniusAI/Makefile) AC_OUTPUT(Makefile lib/Makefile client/Makefile server/Makefile AI/Makefile AI/GeniusAI/Makefile AI/EmptyAI/Makefile)

3
lib/Connection.cpp
View File

@ -5,6 +5,9 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <fstream> #include <fstream>
#include "../lib/RegisterTypes.cpp"
using namespace boost; using namespace boost;
using namespace boost::asio::ip; using namespace boost::asio::ip;
template<typename Serializer> DLL_EXPORT void registerTypes(Serializer &s); //defined elsewhere and explicitly instantiated for used serializers template<typename Serializer> DLL_EXPORT void registerTypes(Serializer &s); //defined elsewhere and explicitly instantiated for used serializers

4
lib/NetPacks.h
View File

@ -580,13 +580,15 @@ struct BlockingDialog : public Query//2003
BlockingDialog(bool yesno, bool Selection) BlockingDialog(bool yesno, bool Selection)
{ {
type = 2003; type = 2003;
flags = 0;
if(yesno) flags |= ALLOW_CANCEL; if(yesno) flags |= ALLOW_CANCEL;
if(Selection) flags |= SELECTION; if(Selection) flags |= SELECTION;
} }
BlockingDialog() BlockingDialog()
{ {
type = 2003; type = 2003;
flags = 0;
}; };
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)