[Openmugen-cvs] CVS: OpenMugen/src ControllerExecuter.cpp,1.9,1.10 Makefile.win,1.8,1.9 OpenMugen.dev,1.8,1.9 OpenMugen.layout,1.13,1.14 SDLManager.cpp,1.5,1.6 VideoSystem.cpp,1.8,1.9 engine.cpp,1.9,1.10

[SakirSoft <sak...@us...>]

Update of /cvsroot/openmugen/OpenMugen/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11525

Modified Files:
	ControllerExecuter.cpp Makefile.win OpenMugen.dev 
	OpenMugen.layout SDLManager.cpp VideoSystem.cpp engine.cpp 
Log Message:
no message

Index: ControllerExecuter.cpp
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/ControllerExecuter.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- ControllerExecuter.cpp	2 Jul 2005 17:13:05 -0000	1.9
+++ ControllerExecuter.cpp	6 Jul 2005 19:01:25 -0000	1.10
@@ -590,7 +590,7 @@ void CControllerExecuter::HitDef()
      hitvar.air_yvel  = m_pVM->Execute(temp->air_y_velocity);
      hitvar.xvel      = m_pVM->Execute(temp->ground_x_velocity);
      hitvar.yvel      = m_pVM->Execute(temp->ground_y_velocity);
-     hitvar.yaccel    = 0.44f;  //fixed value
+     hitvar.yaccel    = m_pVM->Execute(temp->yaccel,m_CurrentPlayer->ConstData.Movement.yaccl);
      hitvar.fall_recovertime =  m_pVM->Execute(temp->fall_recovertime,4);
      hitvar.recovertime      =  m_CurrentPlayer->ConstData.Data.nLieDownTime;
      hitvar.fall_yvel = m_pVM->Execute(temp->fall_yvelocity,-4.5);
@@ -599,11 +599,20 @@ void CControllerExecuter::HitDef()
      hitvar.snd_grp  = (int)m_pVM->Execute(temp->snd_grp);
      hitvar.snd_item = (int)m_pVM->Execute(temp->snd_item);
      hitvar.bPlayerSnd = temp->bPlayerSound;
-     hitvar.spark_nr = (int)m_pVM->Execute(temp->sparkno);
+     hitvar.spark_nr = (int)m_pVM->Execute(temp->sparkno,m_CurrentPlayer->ConstData.Data.nSparkNo);
      hitvar.spark_x = m_pVM->Execute(temp->spark_x);
      hitvar.spark_y = m_pVM->Execute(temp->spark_y);
      hitvar.fall    = m_pVM->Execute(temp->fall);
-//     hitvar.fall_yvel = -1; 
+     hitvar.guard_spark_no= m_pVM->Execute(temp->guardsparkno,m_CurrentPlayer->ConstData.Data.nGuardSparkNr);
+     hitvar.bPlayerSpark = temp->bPlayerSpark;
+     hitvar.guardPauseTime = m_pVM->Execute( temp->p1_Gpausetime,hitvar.pauseTime );
+     hitvar.bGuardPlayerSnd = temp->bPlayerGuardSound;
+     hitvar.guard_snd_grp  = m_pVM->Execute(temp->snd_guard_grp,6);                        
+     hitvar.guard_snd_item = m_pVM->Execute(temp->snd_guard_item,0);                        
+     
+     //Set guard dist
+     m_CurrentPlayer->SetAttackDist( m_pVM->Execute(temp->guard_dist,m_CurrentPlayer->ConstData.Size.nAttackDist) );
+
 
          
      

Index: Makefile.win
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/Makefile.win,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- Makefile.win	2 Jul 2005 17:13:05 -0000	1.8
+++ Makefile.win	6 Jul 2005 19:01:25 -0000	1.9
@@ -1,18 +1,18 @@
 # Project: OpenMugen
 # Makefile created by Dev-C++ 4.9.9.2
 
-CPP  = g++.exe
-CC   = gcc.exe
+CPP  = g++.exe -D__DEBUG__
+CC   = gcc.exe -D__DEBUG__
 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  
+LIBS =  -L"D:/Development/tools/Dev-Cpp/lib" -lmingw32 -lSDLmain -lSDL -lSGE -lSDL_Image -lSDL_mixer -lSDL_image  -g3 
 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  
-CFLAGS = $(INCS) -Dmain=SDL_main  
+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   -g3
+CFLAGS = $(INCS) -Dmain=SDL_main   -g3
 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.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- OpenMugen.dev	2 Jul 2005 17:13:05 -0000	1.8
+++ OpenMugen.dev	6 Jul 2005 19:01:25 -0000	1.9
@@ -27,7 +27,7 @@ CustomMakefile=
 IncludeVersionInfo=0
 SupportXPThemes=0
 CompilerSet=0
-CompilerSettings=0000000000000000000000
+CompilerSettings=0000000000000001000000
 
 [Unit1]
 FileName=main.cpp

Index: OpenMugen.layout
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/OpenMugen.layout,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- OpenMugen.layout	2 Jul 2005 17:13:05 -0000	1.13
+++ OpenMugen.layout	6 Jul 2005 19:01:25 -0000	1.14
@@ -6,24 +6,24 @@ LeftChar=1
 Open=0
 Top=0
 [Editors]
-Focused=7
-Order=20,4,1,35,0,43,39,38,44,32,33,46,5,17,18,29,31,2,15,28,7
+Focused=39
+Order=39,-1
 [Editor_0]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=14
 TopLine=22
 LeftChar=1
 [Editor_1]
-Open=1
+Open=0
 Top=0
 CursorCol=32
 CursorRow=79
 TopLine=40
 LeftChar=1
 [Editor_2]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=92
@@ -37,18 +37,18 @@ CursorRow=57
 TopLine=31
 LeftChar=1
 [Editor_4]
-Open=1
+Open=0
 Top=0
 CursorCol=6
 CursorRow=281
 TopLine=259
 LeftChar=1
 [Editor_5]
-Open=1
+Open=0
 Top=0
-CursorCol=32
-CursorRow=48
-TopLine=110
+CursorCol=4
+CursorRow=93
+TopLine=63
 LeftChar=1
 [Editor_6]
 Open=0
@@ -58,11 +58,11 @@ CursorRow=27
 TopLine=13
 LeftChar=1
 [Editor_7]
-Open=1
-Top=1
-CursorCol=29
-CursorRow=52
-TopLine=40
+Open=0
+Top=0
+CursorCol=1
+CursorRow=135
+TopLine=99
 LeftChar=1
 [Editor_8]
 Open=0
@@ -83,7 +83,7 @@ Open=0
 Top=0
 CursorCol=26
 CursorRow=24
-TopLine=41
+TopLine=42
 LeftChar=1
 [Editor_11]
 Open=0
@@ -107,7 +107,7 @@ CursorRow=35
 TopLine=8
 LeftChar=1
 [Editor_15]
-Open=1
+Open=0
 Top=0
 CursorCol=13
 CursorRow=20
@@ -121,32 +121,32 @@ CursorRow=146
 TopLine=127
 LeftChar=1
 [Editor_17]
-Open=1
+Open=0
 Top=0
-CursorCol=25
-CursorRow=116
-TopLine=100
+CursorCol=24
+CursorRow=102
+TopLine=81
 LeftChar=1
 [Editor_18]
-Open=1
+Open=0
 Top=0
-CursorCol=9
-CursorRow=175
-TopLine=121
+CursorCol=11
+CursorRow=231
+TopLine=215
 LeftChar=1
 [Editor_19]
 Open=0
 Top=0
-CursorCol=32
-CursorRow=458
-TopLine=431
+CursorCol=26
+CursorRow=203
+TopLine=420
 LeftChar=1
 [Editor_20]
-Open=1
+Open=0
 Top=0
-CursorCol=10
-CursorRow=986
-TopLine=1
+CursorCol=18
+CursorRow=1016
+TopLine=1007
 LeftChar=1
 [Editor_21]
 Open=0
@@ -165,16 +165,16 @@ LeftChar=1
 [Editor_23]
 Open=0
 Top=0
-CursorCol=3
-CursorRow=1536
-TopLine=1512
-LeftChar=1
+CursorCol=16
+CursorRow=1589
+TopLine=1583
+LeftChar=5
 [Editor_24]
 Open=0
 Top=0
 CursorCol=16
-CursorRow=187
-TopLine=170
+CursorRow=188
+TopLine=153
 LeftChar=1
 [Editor_25]
 Open=0
@@ -188,24 +188,24 @@ Open=0
 Top=0
 CursorCol=73
 CursorRow=372
-TopLine=344
+TopLine=1
 LeftChar=1
 [Editor_27]
 Open=0
 Top=0
-CursorCol=11
-CursorRow=107
-TopLine=82
+CursorCol=8
+CursorRow=175
+TopLine=217
 LeftChar=1
 [Editor_28]
-Open=1
+Open=0
 Top=0
 CursorCol=3
 CursorRow=78
 TopLine=22
 LeftChar=1
 [Editor_29]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=12
@@ -219,39 +219,39 @@ CursorRow=34
 TopLine=47
 LeftChar=1
 [Editor_31]
-Open=1
+Open=0
 Top=0
-CursorCol=5
-CursorRow=248
-TopLine=14
+CursorCol=27
+CursorRow=15
+TopLine=1
 LeftChar=1
 [Editor_32]
-Open=1
+Open=0
 Top=0
 CursorCol=19
 CursorRow=33
 TopLine=16
 LeftChar=1
 [Editor_33]
-Open=1
+Open=0
 Top=0
-CursorCol=30
-CursorRow=539
-TopLine=519
+CursorCol=68
+CursorRow=611
+TopLine=587
 LeftChar=1
 [Editor_34]
 Open=0
 Top=0
 CursorCol=1
 CursorRow=55
-TopLine=17
+TopLine=1
 LeftChar=1
 [Editor_35]
-Open=1
+Open=0
 Top=0
 CursorCol=45
 CursorRow=209
-TopLine=188
+TopLine=460
 LeftChar=1
 [Editor_36]
 Open=0
@@ -263,23 +263,23 @@ LeftChar=1
 [Editor_37]
 Open=0
 Top=0
-CursorCol=5
-CursorRow=4471
-TopLine=395
+CursorCol=51
+CursorRow=3853
+TopLine=3818
 LeftChar=1
 [Editor_38]
-Open=1
+Open=0
 Top=0
-CursorCol=1
-CursorRow=23
+CursorCol=25
+CursorRow=28
 TopLine=1
 LeftChar=1
 [Editor_39]
 Open=1
-Top=0
-CursorCol=7
-CursorRow=23
-TopLine=50
+Top=1
+CursorCol=34
+CursorRow=167
+TopLine=155
 LeftChar=1
 [Editor_40]
 Open=0
@@ -303,18 +303,18 @@ CursorRow=4
 TopLine=1
 LeftChar=1
 [Editor_43]
-Open=1
+Open=0
 Top=0
-CursorCol=36
-CursorRow=68
-TopLine=31
+CursorCol=14
+CursorRow=76
+TopLine=16
 LeftChar=1
 [Editor_44]
-Open=1
+Open=0
 Top=0
-CursorCol=1
-CursorRow=101
-TopLine=65
+CursorCol=8
+CursorRow=48
+TopLine=95
 LeftChar=1
 [Editor_45]
 Open=0
@@ -324,11 +324,11 @@ CursorRow=87
 TopLine=46
 LeftChar=1
 [Editor_46]
-Open=1
+Open=0
 Top=0
-CursorCol=51
-CursorRow=192
-TopLine=190
+CursorCol=27
+CursorRow=49
+TopLine=1
 LeftChar=1
 [Editor_47]
 Open=0
@@ -340,9 +340,9 @@ LeftChar=1
 [Editor_48]
 Open=0
 Top=0
-CursorCol=6
-CursorRow=427
-TopLine=409
+CursorCol=2
+CursorRow=143
+TopLine=106
 LeftChar=1
 [Editor_49]
 Open=0

Index: SDLManager.cpp
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/SDLManager.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- SDLManager.cpp	29 Jun 2005 12:21:27 -0000	1.5
+++ SDLManager.cpp	6 Jul 2005 19:01:25 -0000	1.6
@@ -90,9 +90,7 @@ bool CSDLManager::Init()
         return false;                          
     }
         
-    //m_SoundSystem.LoadMusic("ryu.mid");
-    //m_SoundSystem.PlayMusic();
-
+   
 	return true;
 }
 

Index: VideoSystem.cpp
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/VideoSystem.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- VideoSystem.cpp	2 Jul 2005 17:13:05 -0000	1.8
+++ VideoSystem.cpp	6 Jul 2005 19:01:25 -0000	1.9
@@ -83,12 +83,12 @@ void CVideoSystem::LoadFont()
 {
      //first init the font system
      ASSERT(sge_TTF_Init() == 0);
-     lpTTF=sge_TTF_OpenFont("arial.ttf",50);
+     lpTTF=sge_TTF_OpenFont("arial.ttf",8);
      if(!lpTTF)
         throw(CError("arial.ttf not found"));
         
      sge_TTF_SetFontStyle(lpTTF, SGE_TTF_NORMAL);
-     sge_TTF_SetFontSize(lpTTF,8);
+     sge_TTF_AAOff();
   
 }
 
@@ -116,9 +116,9 @@ 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();
+   FilterImage();
    
    //SDL_UpdateRect(screen,0,0,640,480);
     SDL_Flip(screen);
@@ -206,7 +206,7 @@ void CVideoSystem::DrawText(s16 x,s16 y,
    va_end(ap);      
    
    sge_tt_textout(work,lpTTF,string,x,y,
-                  SDL_MapRGB(screen->format,255,255,255),0,255);
+                  SDL_MapRGB(screen->format,255,255,255),11,255);
 
 
 }

Index: engine.cpp
===================================================================
RCS file: /cvsroot/openmugen/OpenMugen/src/engine.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- engine.cpp	1 Jul 2005 18:04:10 -0000	1.9
+++ engine.cpp	6 Jul 2005 19:01:25 -0000	1.10
@@ -12,7 +12,7 @@ CEngine::CEngine()
 {
   bPause=false;
   bPreIntro = false;
-  nEngineState = EnginePreIntro;
+  nEngineState = EngineRun;
                   
 }