games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Various gcc compile fixes, and updates to linux code.

Browse Source
This commit is contained in:
Frank Zago
2011-04-07 02:16:32 +00:00
parent 7874d84c4e
commit 69364b5b60
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/CVideoHandler.cpp
View File

@@ -917,10 +917,6 @@ bool CVideoPlayer::playVideo(int x, int y, SDL_Surface *dst, bool stopOnKey)
pos.x = x; pos.x = x;
pos.y = y; pos.y = y;
FPSmanager mainFPSmng;
SDL_initFramerate(&mainFPSmng);
SDL_setFramerate(&mainFPSmng, 48);
while(nextFrame()) { while(nextFrame()) {
if(stopOnKey && keyDown()) if(stopOnKey && keyDown())
@@ -929,9 +925,9 @@ bool CVideoPlayer::playVideo(int x, int y, SDL_Surface *dst, bool stopOnKey)
SDL_DisplayYUVOverlay(overlay, &pos); SDL_DisplayYUVOverlay(overlay, &pos);
// Wait 3 frames // Wait 3 frames
SDL_framerateDelay(&mainFPSmng); GH.mainFPSmng->framerateDelay();
SDL_framerateDelay(&mainFPSmng); GH.mainFPSmng->framerateDelay();
SDL_framerateDelay(&mainFPSmng); GH.mainFPSmng->framerateDelay();
} }
return true; return true;

2
client/GUIBase.h
View File

@@ -564,7 +564,7 @@ public:
void handleMoveInterested( const SDL_MouseMotionEvent & motion ); void handleMoveInterested( const SDL_MouseMotionEvent & motion );
void fakeMouseMove(); void fakeMouseMove();
void breakEventHandling(); //current event won't be propagated anymore void breakEventHandling(); //current event won't be propagated anymore
void CGuiHandler::drawFPSCounter(); // draws the FPS to the upper left corner of the screen void drawFPSCounter(); // draws the FPS to the upper left corner of the screen
ui8 defActionsDef; //default auto actions ui8 defActionsDef; //default auto actions
ui8 captureChildren; //all newly created objects will get their parents from stack and will be added to parents children list ui8 captureChildren; //all newly created objects will get their parents from stack and will be added to parents children list
std::list<CIntObject *> createdObj; //stack of objs being created std::list<CIntObject *> createdObj; //stack of objs being created

2
client/SDL_framerate.h
View File

@@ -25,7 +25,7 @@ public:
int fps; // the actual fps value int fps; // the actual fps value
FPSManager(int rate); // initializes the manager with a given fps rate FPSManager(int rate); // initializes the manager with a given fps rate
void FPSManager::init(); // needs to be called directly before the main game loop to reset the internal timer void init(); // needs to be called directly before the main game loop to reset the internal timer
void framerateDelay(); // needs to be called every game update cycle void framerateDelay(); // needs to be called every game update cycle
}; };

2
lib/ERMParser.cpp
View File

@@ -559,6 +559,6 @@ void ERMParser::repairEncoding( char * str, int len ) const
#else #else
ERMParser::ERMParser(std::string file){} ERMParser::ERMParser(std::string file){}
void ERMParser::parseFile(){} std::vector<ERM::TLine> ERMParser::parseFile() {}
#endif #endif