1 --- old_Game.cpp 2008-10-30 15:46:15.000000000 +0200
2 +++ Game.cpp 2008-10-30 15:49:14.000000000 +0200
3 @@ -1197,100 +1197,9 @@
15 - m_log.capacity(512);
17 - m_lastTickTime = SDL_GetTicks();
22 - printf("stop recording: %d events\n",m_log.size());
30 - m_lastTickTime = SDL_GetTicks();
34 - void record( SDL_Event& ev )
37 - m_log.append( m_lastTick, SDL_GetTicks()-m_lastTickTime, ev );
41 - DemoLog& getLog() { return m_log; }
55 - void start( const DemoLog* log )
61 - m_lastTickTime = SDL_GetTicks();
62 - printf("start playback: %d events\n",m_log->size());
65 - bool isRunning() { return m_playing; }
77 - m_lastTickTime = SDL_GetTicks();
81 - bool fetchEvent( SDL_Event& ev )
84 - && m_index < m_log->size()
85 - && m_log->at(m_index).t <= m_lastTick
86 - && m_log->at(m_index).o <= SDL_GetTicks()-m_lastTickTime ) {
87 - ev = m_log->at(m_index).e;
96 - const DemoLog* m_log;
103 class Game : public GameParams
104 @@ -1303,8 +1212,6 @@
105 IconOverlay m_pauseOverlay;
106 EditOverlay m_editOverlay;
107 // DemoOverlay m_demoOverlay;
108 - DemoRecorder m_recorder;
109 - DemoPlayer m_player;
112 Game( int width, int height )
113 @@ -1328,15 +1235,11 @@
120 // for ( int i=0; i<m_recorder.getLog().size(); i++ ) {
121 // printf("DEMO: %s\n",m_recorder.getLog().asString(i).c_str());
123 - m_player.start( &m_recorder.getLog() );
125 - m_recorder.start();
129 @@ -1659,26 +1562,23 @@
130 while ( iterateCounter < ITERATION_RATE ) {
140 more = SDL_PollEvent(&ev);
141 - if ( m_player.isRunning()
143 && ( ev.type==SDL_MOUSEMOTION ||
144 ev.type==SDL_MOUSEBUTTONDOWN ||
145 ev.type==SDL_MOUSEBUTTONUP ) ) {
146 more = false; //discard
149 - more = m_player.fetchEvent(ev);
153 bool handled = false;
154 - m_recorder.record( ev );
155 for ( int i=m_overlays.size()-1; i>=0 && !handled; i-- ) {
156 handled = m_overlays[i]->handleEvent(ev);
158 @@ -1703,8 +1603,6 @@
159 if ( m_scene.isCompleted() != isComplete && !m_edit ) {
160 isComplete = m_scene.isCompleted();
164 showOverlay( completedOverlay );
166 hideOverlay( completedOverlay );