--- mario-kart-git-bb3a46c7b.old/Game/Game.cpp +++ mario-kart-git-bb3a46c7b/Game/Game.cpp @@ -24,6 +24,7 @@ TrackInfo info = mCurrentTrack->info(); +#ifdef NOTDEF mOpponents[0] = new Opponent(Opponent::Luigi); mOpponents[0]->setX(913); mOpponents[0]->setY(604); @@ -31,7 +32,7 @@ mOpponents[1] = new Opponent(Opponent::Peach); mOpponents[1]->setX(943); mOpponents[1]->setY(627); - +#endif // mCamera->setX(info.startCameraX); // mCamera->setY(info.startCameraY); @@ -62,6 +63,9 @@ if (key[KEY_RIGHT]) mCamera->setAngle(mCamera->angle() + 0.1);*/ + + if ((mPlayer->x() < -25) || (mPlayer->x() > 1025)) mQuit = true; + if ((mPlayer->y() < -25) || (mPlayer->y() > 1025)) mQuit = true; } void Game::update() @@ -70,8 +74,10 @@ mCamera->update(mPlayer); mPlayer->updateBmp(mCamera->angle()); +#ifdef NOTDEF for (int i = 0; i < (sizeof(mOpponents) / sizeof(*mOpponents)); i++) mOpponents[i]->update(); +#endif } void Game::render() @@ -106,6 +112,7 @@ mCamera->y(), mCamera->mode7Params()); +#ifdef NOTDEF for (int i = 0; i < (sizeof(mOpponents) / sizeof(*mOpponents)); i++) { Opponent *opponent = mOpponents[i]; @@ -118,6 +125,7 @@ opponent->y()-(opponent->y()-mPlayer->y()), mCamera->mode7Params()); } +#endif // Joga tudo na tela blit(buffer, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H); --- mario-kart-git-bb3a46c7b.old/Game/main.cpp +++ mario-kart-git-bb3a46c7b/Game/main.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include int main(int argc, const char *argv[]) { @@ -11,10 +13,26 @@ allegro->setupScreen(ObjectSize(640, 480)); allegro->initializeTimers(); allegro->installKeyboard(); - int OldTime = 0; + + if (install_sound (DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) < 0) + { + exit (1); + } + + DUH *music; + dumb_register_stdfiles(); + music = load_duh ("starfield.xm"); + if (!music) music = dumb_load_xm ("starfield.xm"); + if (!music) exit (1); + + AL_DUH_PLAYER *dp; + dp = al_start_duh (music, 2, 0, 1.0f, 4096, 22050); + + int OldTime = 0; Game game; while (!game.quit()) { - while (AllegroSystem::SpeedCounter == 0) + al_poll_duh (dp); + while (AllegroSystem::SpeedCounter == 0) rest(100 / 30); while (AllegroSystem::SpeedCounter > 0) { @@ -38,6 +56,7 @@ game.render(); } + al_stop_duh (dp); return 0; } END_OF_MAIN();