miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverted all src changes from rev95 commit (because all old work was just removed)

Browse Source 
git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@107 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
This commit is contained in:
albertzeyer
2009-07-22 21:50:13 +00:00
parent ef725f8581
commit 23ef380643
50 changed files with 5547 additions and 5582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/sdl/CVideoDriver.cpp
View File

@@ -480,7 +480,7 @@ char tempbuf[80];
#else
sprintf(tempbuf, "FPS: %03d", fps);
#endif
g_pGraphics->drawFont( (unsigned char *) tempbuf, 320-3-(strlen( (char *) tempbuf)<<3), 3, 1);
g_pGraphics->drawFont( tempbuf, 320-3-(strlen( (char *) tempbuf)<<3), 3, 1);
}
update_screen();
@@ -499,11 +499,11 @@ void CVideoDriver::update_screen(void)
mp_OpenGL->render();
SDL_LockSurface(FGLayerSurface);
LockSurface(FGLayerSurface);
// Flush the layers
memset(FGLayerSurface->pixels,SDL_MapRGB(FGLayerSurface->format, 0, 0, 0),
GAME_STD_WIDTH*GAME_STD_HEIGHT*FGLayerSurface->format->BytesPerPixel);
SDL_UnlockSurface(FGLayerSurface);
UnlockSurface(FGLayerSurface);
}
else // No OpenGL but Software Rendering
{
@@ -514,8 +514,8 @@ void CVideoDriver::update_screen(void)
// another offscreen buffer, and must now stretchblit it to the screen
if (Zoom == 1 && m_Resolution.width != 320 )
{
SDL_LockSurface(BlitSurface);
SDL_LockSurface(screen);
LockSurface(BlitSurface);
LockSurface(screen);
if(Filtermode == 0)
{
@@ -527,13 +527,13 @@ void CVideoDriver::update_screen(void)
g_pLogFile->textOut(PURPLE,"Try to use a higher zoom factor. Switching to no-filter<br>");
Filtermode = 0;
}
SDL_UnlockSurface(screen);
SDL_UnlockSurface(BlitSurface);
UnlockSurface(screen);
UnlockSurface(BlitSurface);
}
if (Zoom == 2)
{
SDL_LockSurface(BlitSurface);
SDL_LockSurface(screen);
LockSurface(BlitSurface);
LockSurface(screen);
if(Filtermode == 0)
{
@@ -551,13 +551,13 @@ void CVideoDriver::update_screen(void)
Filtermode = 0;
}
SDL_UnlockSurface(screen);
SDL_UnlockSurface(BlitSurface);
UnlockSurface(screen);
UnlockSurface(BlitSurface);
}
else if (Zoom == 3)
{
SDL_LockSurface(BlitSurface);
SDL_LockSurface(screen);
LockSurface(BlitSurface);
LockSurface(screen);
if(Filtermode == 0)
{
@@ -579,13 +579,13 @@ void CVideoDriver::update_screen(void)
g_pLogFile->textOut(PURPLE,"Try to use a higher zoom factor. Switching to no-filter<br>");
Filtermode = 0;
}
SDL_UnlockSurface(screen);
SDL_UnlockSurface(BlitSurface);
UnlockSurface(screen);
UnlockSurface(BlitSurface);
}
else if (Zoom == 4)
{
SDL_LockSurface(BlitSurface);
SDL_LockSurface(screen);
LockSurface(BlitSurface);
LockSurface(screen);
if(Filtermode == 0)
{
@@ -612,18 +612,18 @@ void CVideoDriver::update_screen(void)
g_pLogFile->textOut(PURPLE,"Try to use a higher zoom factor. Switching to no-filter<br>");
Filtermode = 0;
}
SDL_UnlockSurface(screen);
SDL_UnlockSurface(BlitSurface);
UnlockSurface(screen);
UnlockSurface(BlitSurface);
}
SDL_Flip(screen);
//SDL_UpdateRect(screen, screenrect.x, screenrect.y, screenrect.w, screenrect.h);
SDL_LockSurface(FGLayerSurface);
LockSurface(FGLayerSurface);
// Flush the layers
memset(FGLayerSurface->pixels,SDL_MapRGB(FGLayerSurface->format, 0, 0, 0),
GAME_STD_WIDTH*GAME_STD_HEIGHT*FGLayerSurface->format->BytesPerPixel);
SDL_UnlockSurface(FGLayerSurface);
UnlockSurface(FGLayerSurface);
#ifdef USE_OPENGL
}
#endif
@@ -765,7 +765,7 @@ int y;
y = CONSOLE_MESSAGE_Y;
for(i=0;i<NumConsoleMessages;i++)
{
g_pGraphics->drawFont( (unsigned char *) cmsg[i].msg, CONSOLE_MESSAGE_X, y, 1);
g_pGraphics->drawFont( cmsg[i].msg, CONSOLE_MESSAGE_X, y, 1);
y += CONSOLE_MESSAGE_SPACING;
}
}