Menu
▾
▴
[Openmugen-cvs] CVS: OpenMugen/src Makefile.win,1.10,1.11 OpenMugen.dev,1.10,1.11 OpenMugen.layout,1.16,1.17 VideoSystem.cpp,1.11,1.12 global.h,1.7,1.8
|
From: SakirSoft <sak...@us...> - 2005-07-11 19:58:14
|
Update of /cvsroot/openmugen/OpenMugen/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13190 Modified Files: Makefile.win OpenMugen.dev OpenMugen.layout VideoSystem.cpp global.h Log Message: no message Index: Makefile.win =================================================================== RCS file: /cvsroot/openmugen/OpenMugen/src/Makefile.win,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -p -r1.10 -r1.11 --- Makefile.win 11 Jul 2005 16:12:15 -0000 1.10 +++ Makefile.win 11 Jul 2005 19:57:39 -0000 1.11 @@ -7,12 +7,12 @@ WINDRES = windres.exe RES = OBJ = ../OBJ/main.o ../OBJ/game.o ../OBJ/global.o ../OBJ/SDLManager.o ../OBJ/VideoSystem.o ../OBJ/scale2xSDL.o ../OBJ/SDL_framerate.o ../OBJ/scale2x.o ../OBJ/MemManager.o ../OBJ/SffManager.o ../OBJ/player.o ../OBJ/Stack.o ../OBJ/VM.o ../OBJ/StateManager.o ../OBJ/AirManager.o ../OBJ/engine.o ../OBJ/ControllerExecuter.o ../OBJ/tokenizer.o ../OBJ/StateParser.o ../OBJ/CmdManager.o ../OBJ/assert.o ../OBJ/Input.o ../OBJ/SoundSystem.o ../OBJ/GameObjects.o $(RES) LINKOBJ = ../OBJ/main.o ../OBJ/game.o ../OBJ/global.o ../OBJ/SDLManager.o ../OBJ/VideoSystem.o ../OBJ/scale2xSDL.o ../OBJ/SDL_framerate.o ../OBJ/scale2x.o ../OBJ/MemManager.o ../OBJ/SffManager.o ../OBJ/player.o ../OBJ/Stack.o ../OBJ/VM.o ../OBJ/StateManager.o ../OBJ/AirManager.o ../OBJ/engine.o ../OBJ/ControllerExecuter.o ../OBJ/tokenizer.o ../OBJ/StateParser.o ../OBJ/CmdManager.o ../OBJ/assert.o ../OBJ/Input.o ../OBJ/SoundSystem.o ../OBJ/GameObjects.o $(RES) -LIBS = -L"D:/Development/tools/Dev-Cpp/lib" -lmingw32 -lSDLmain -lSDL -lSGE -lSDL_Image -lSDL_mixer -lSDL_image -march=pentium4 -msse2 +LIBS = -L"D:/Development/tools/Dev-Cpp/lib" -lmingw32 -lSDLmain -lSDL -lSGE -lSDL_Image -lSDL_mixer -lSDL_image INCS = -I"D:/Development/tools/Dev-Cpp/include" CXXINCS = -I"D:/Development/tools/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"D:/Development/tools/Dev-Cpp/include/c++/3.4.2/backward" -I"D:/Development/tools/Dev-Cpp/include/c++/3.4.2/mingw32" -I"D:/Development/tools/Dev-Cpp/include/c++/3.4.2" -I"D:/Development/tools/Dev-Cpp/include" BIN = ../BIN/OpenMugen.exe -CXXFLAGS = $(CXXINCS) -I"D:\Development\tools\Dev-Cpp\\include\SDL" -I"D:\Development\tools\Dev-Cpp\\include\SGE" -Dmain=SDL_main -D_WIN32 -D_DEBUG -march=pentium4 -msse2 -CFLAGS = $(INCS) -Dmain=SDL_main -march=pentium4 -msse2 +CXXFLAGS = $(CXXINCS) -I"D:\Development\tools\Dev-Cpp\\include\SDL" -I"D:\Development\tools\Dev-Cpp\\include\SGE" -Dmain=SDL_main -D_WIN32 -D_DEBUG +CFLAGS = $(INCS) -Dmain=SDL_main RM = rm -f .PHONY: all all-before all-after clean clean-custom Index: OpenMugen.dev =================================================================== RCS file: /cvsroot/openmugen/OpenMugen/src/OpenMugen.dev,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -p -r1.10 -r1.11 --- OpenMugen.dev 11 Jul 2005 16:12:15 -0000 1.10 +++ OpenMugen.dev 11 Jul 2005 19:57:40 -0000 1.11 @@ -27,7 +27,7 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -CompilerSettings=00000000000000000000ib +CompilerSettings=0000000000000000000000 [Unit1] FileName=main.cpp Index: OpenMugen.layout =================================================================== RCS file: /cvsroot/openmugen/OpenMugen/src/OpenMugen.layout,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -p -r1.16 -r1.17 --- OpenMugen.layout 11 Jul 2005 16:12:15 -0000 1.16 +++ OpenMugen.layout 11 Jul 2005 19:57:40 -0000 1.17 @@ -3,31 +3,31 @@ CursorCol=3 CursorRow=28 TopLine=1 LeftChar=1 -Open=0 +Open=1 Top=0 [Editors] -Focused=33 -Order=23,24,33,20,48,19,18,17,28,27,7,0,37,36,1,4,47,8,46 +Focused=7 +Order=23,24,33,20,48,19,18,17,28,27,7,0,37,36,1,4,47,8,46,14,31,2,5,30,21 [Editor_0] Open=1 Top=0 -CursorCol=1 -CursorRow=1 -TopLine=1 +CursorCol=27 +CursorRow=32 +TopLine=16 LeftChar=1 [Editor_1] Open=1 Top=0 -CursorCol=32 -CursorRow=79 -TopLine=39 +CursorCol=15 +CursorRow=26 +TopLine=16 LeftChar=1 [Editor_2] -Open=0 +Open=1 Top=0 CursorCol=1 CursorRow=74 -TopLine=51 +TopLine=36 LeftChar=1 [Editor_3] Open=0 @@ -40,15 +40,15 @@ LeftChar=1 Open=1 Top=0 CursorCol=22 -CursorRow=23 -TopLine=1 +CursorRow=38 +TopLine=7 LeftChar=1 [Editor_5] -Open=0 +Open=1 Top=0 CursorCol=2 CursorRow=95 -TopLine=58 +TopLine=64 LeftChar=1 [Editor_6] Open=0 @@ -59,10 +59,10 @@ TopLine=13 LeftChar=1 [Editor_7] Open=1 -Top=0 -CursorCol=1 -CursorRow=312 -TopLine=275 +Top=1 +CursorCol=54 +CursorRow=60 +TopLine=53 LeftChar=1 [Editor_8] Open=1 @@ -144,16 +144,16 @@ LeftChar=1 [Editor_20] Open=1 Top=0 -CursorCol=29 -CursorRow=220 -TopLine=192 +CursorCol=22 +CursorRow=182 +TopLine=147 LeftChar=1 [Editor_21] -Open=0 +Open=1 Top=0 CursorCol=13 CursorRow=68 -TopLine=28 +TopLine=1 LeftChar=1 [Editor_22] Open=0 @@ -212,18 +212,18 @@ CursorRow=12 TopLine=1 LeftChar=1 [Editor_30] -Open=0 +Open=1 Top=0 CursorCol=17 CursorRow=20 -TopLine=3 +TopLine=1 LeftChar=1 [Editor_31] -Open=0 +Open=1 Top=0 -CursorCol=27 -CursorRow=15 -TopLine=112 +CursorCol=80 +CursorRow=92 +TopLine=71 LeftChar=1 [Editor_32] Open=0 @@ -234,7 +234,7 @@ TopLine=16 LeftChar=1 [Editor_33] Open=1 -Top=1 +Top=0 CursorCol=25 CursorRow=487 TopLine=449 @@ -299,7 +299,7 @@ Top=0 Open=0 Top=0 CursorCol=1 -CursorRow=4 +CursorRow=8 TopLine=1 LeftChar=1 [Editor_43] @@ -328,7 +328,7 @@ Open=1 Top=0 CursorCol=21 CursorRow=114 -TopLine=109 +TopLine=1 LeftChar=1 [Editor_47] Open=1 Index: VideoSystem.cpp =================================================================== RCS file: /cvsroot/openmugen/OpenMugen/src/VideoSystem.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -p -r1.11 -r1.12 --- VideoSystem.cpp 11 Jul 2005 16:12:15 -0000 1.11 +++ VideoSystem.cpp 11 Jul 2005 19:57:40 -0000 1.12 @@ -57,7 +57,7 @@ bool CVideoSystem::InitSystem() { PrintMessage("CVideoSystem::InitSystem()"); //Set Video mode and get main Surface - screen=SDL_SetVideoMode(640,480,16,SDL_HWSURFACE/*|SDL_FULLSCREEN|*/|SDL_DOUBLEBUF); + screen=SDL_SetVideoMode(320,240,16,SDL_HWSURFACE|SDL_FULLSCREEN/*|*|SDL_DOUBLEBUF*/); //Check the surface for validate if(screen==NULL) { @@ -106,7 +106,7 @@ void CVideoSystem::Draw() DrawAllImages(); nowTime=SDL_GetTicks(); - if(nowTime > lastTime+250) + if(nowTime > lastTime+500) { nFps=(float)nFpsCount*1000 / (nowTime-lastTime); nFpsCount=0; @@ -116,10 +116,10 @@ void CVideoSystem::Draw() DrawText(265,10,"%2.2f FPS",nFps); - // SDL_BlitSurface(work,NULL,screen,NULL); + SDL_BlitSurface(work,NULL,screen,NULL); //scale2x(work,screen); - FilterImage(); - //SDL_SoftStretch(work,0,screen,0); + // FilterImage(); +// SDL_SoftStretch(work,0,screen,0); //SDL_UpdateRect(screen,0,0,640,480); SDL_Flip(screen); Index: global.h =================================================================== RCS file: /cvsroot/openmugen/OpenMugen/src/global.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -p -r1.7 -r1.8 --- global.h 2 Jul 2005 17:13:05 -0000 1.7 +++ global.h 11 Jul 2005 19:57:41 -0000 1.8 @@ -3,7 +3,7 @@ //Version #define VER "PreAlpha" -#define OMTITLE "OpenMugen PreAlpha Demo 26.6.2005" +#define OMTITLE "OpenMugen PreAlpha Demo 11.7.2005" #include "SDL.h" #include "SDL_image.h" |