projects / packages / clanbomber.git / blame
| Commit | Line | Data |
|---|---|---|
| fe62c55d MM |
1 | --- clanbomber/ClanBomber.cpp |
| 2 | +++ clanbomber/ClanBomber.cpp | |
| 3 | @@ -79,6 +79,7 @@ | |
| 4 | ||
| 5 | if (argc > 1 && strcmp (argv[1], "-datafile") == 0) { | |
| 6 | CL_DatafileCompiler::write("clanbomber.scr", "clanbomber.dat"); | |
| 7 | + deinit_modules(); | |
| 8 | return 0; | |
| 9 | } | |
| 10 | ||
| 11 | @@ -204,6 +205,7 @@ | |
| 12 | case MENU_EXIT: | |
| 13 | menu->scroll_out(); | |
| 14 | delete menu; | |
| 15 | + deinit_modules(); | |
| 16 | return 0; | |
| 17 | break; | |
| 18 | case MENU_PLAYER_SETUP: | |
| 19 | @@ -416,6 +418,7 @@ | |
| 20 | { | |
| 21 | cout << endl << "Exception caught from ClanLib:" << endl; | |
| 22 | cout << err.message << endl; | |
| 23 | + deinit_modules(); | |
| 24 | return 255; | |
| 25 | } | |
| 26 | } | |
| 27 | --- clanbomber/Resources.cpp | |
| 28 | +++ clanbomber/Resources.cpp | |
| 29 | @@ -101,25 +101,25 @@ | |
| 30 | ||
| 31 | void Resources::init() | |
| 32 | { | |
| 33 | - try | |
| 34 | - { | |
| 35 | + try | |
| 36 | + { | |
| 37 | res = new CL_ResourceManager("clanbomber.dat", true); | |
| 38 | - } | |
| 39 | - catch (CL_Error err) | |
| 40 | - { | |
| 41 | - try | |
| 42 | - { | |
| 43 | - res = new CL_ResourceManager( | |
| 44 | - "/usr/share/clanbomber/clanbomber.dat", | |
| 45 | - true); | |
| 46 | - } | |
| 47 | - catch (CL_Error err) | |
| 48 | - { | |
| 49 | - res = new CL_ResourceManager( | |
| 50 | - "/usr/local/share/clanbomber/clanbomber.dat", | |
| 51 | - true); | |
| 52 | - } | |
| 53 | - } | |
| 54 | + } catch (CL_Error err) { try { | |
| 55 | + res = new CL_ResourceManager( | |
| 56 | + "/usr/share/games/clanbomber/clanbomber.dat", true); | |
| 57 | + } catch (CL_Error err) { try { | |
| 58 | + res = new CL_ResourceManager( | |
| 59 | + "/usr/local/share/clanbomber/clanbomber.dat", true); | |
| 60 | + } catch (CL_Error err) { try { | |
| 61 | + res = new CL_ResourceManager("clanbomber.scr", false); | |
| 62 | + } catch (CL_Error err) { try { | |
| 63 | + res = new CL_ResourceManager( | |
| 64 | + "/usr/share/games/clanbomber/clanbomber.scr", false); | |
| 65 | + } catch (CL_Error err) { | |
| 66 | + res = new CL_ResourceManager( | |
| 67 | + "/usr/local/share/clanbomber/clanbomber.scr", false); | |
| 68 | + }}}}} | |
| 69 | + | |
| 70 | } | |
| 71 | ||
| 72 | void Resources::load_all() | |
| 73 | --- clanbomber/Makefile.am~ Sun Apr 21 16:10:47 2002 | |
| 74 | +++ clanbomber/Makefile.am Sun Apr 21 16:17:46 2002 | |
| 75 | @@ -6,21 +6,15 @@ | |
| 76 | ||
| 77 | EXTRA_DIST = Bomb.cpp Bomber.h Bomb.h Bomber.cpp Explosion.cpp Explosion.h Extra.cpp Extra.h Extra_Power.cpp Extra_Power.h Map.cpp Config.h GameObject.h GameObject.cpp ClanBomber.h Debug.h Map.h Extra_Kick.h Extra_Skateboard.h Menu.h Config.cpp Debug.cpp Extra_Kick.cpp Extra_Skateboard.cpp Menu.cpp ClanBomber.cpp Observer.cpp Observer.h GameStatus.cpp GameStatus.h Bomber_Corpse.h Bomber_Corpse.cpp Extra_Glove.cpp Extra_Glove.h Controller.cpp Controller.h Extra_Bomb.h Extra_Bomb.cpp Timer.cpp Timer.h clanbomber.scr Controller_AI.cpp Controller_AI.h PlayerSetup.cpp PlayerSetup.h GameStatus_Team.cpp GameStatus_Team.h Disease.cpp Disease.h Disease_Frozen.cpp Disease_Frozen.h Disease_Stoned.cpp Disease_Stoned.h Extra_Joint.cpp Extra_Joint.h Resources.cpp Resources.h MapTile.cpp MapTile.h MapTile_None.cpp MapTile_None.h MapTile_Ground.cpp MapTile_Ground.h MapTile_Box.cpp MapTile_Box.h MapTile_Wall.cpp MapTile_Wall.h MapSelector.cpp MapSelector.h Extra_Viagra.cpp Extra_Viagra.h Extra_Koks.cpp Extra_Koks.h Disease_PutBomb.cpp Disease_PutBomb.h Corpse_Part.cpp Corpse_Part.h MapEntry.cpp MapEntry.h MapTile_Ice.cpp MapTile_Ice.h Controller_AI_MIC.cpp Controller_AI_MIC.h Credits.cpp Credits.h MapTile_Arrow.cpp MapTile_Arrow.h MapEditor.cpp MapEditor.h Controller_Joystick.cpp Controller_Joystick.h Controller_Keyboard.cpp Controller_Keyboard.h MapTile_Trap.cpp MapTile_Trap.h array.h link.h Disease_Fast.cpp Disease_Fast.h | |
| 78 | ||
| 79 | -install-data-local: clanbomber.dat | |
| 80 | - $(mkinstalldirs) $(DESTDIR)$(datadir)/clanbomber/ | |
| 81 | - $(INSTALL_DATA) clanbomber.dat $(DESTDIR)$(datadir)/clanbomber/clanbomber.dat | |
| 82 | +install-data-local: | |
| 83 | $(mkinstalldirs) $(DESTDIR)$(datadir)/clanbomber/ | |
| 84 | $(INSTALL_DATA) clanbomber.scr $(DESTDIR)$(datadir)/clanbomber/clanbomber.scr | |
| 85 | + cp -r pics wavs $(DESTDIR)$(datadir)/clanbomber | |
| 86 | ||
| 87 | uninstall-local: | |
| 88 | -rm -f $(DESTDIR)$(datadir)/clanbomber/clanbomber.dat | |
| 89 | -rm -f $(DESTDIR)$(datadir)/clanbomber/clanbomber.scr | |
| 90 | ||
| 91 | -clanbomber.dat: clanbomber.scr pics/*.pcx pics/*.tga wavs/*.wav maps/*.map music/bud.mod | |
| 92 | - @./clanbomber -datafile | |
| 93 | - | |
| 94 | -all-local: clanbomber.dat | |
| 95 | - | |
| 96 | distclean-local: | |
| 97 | rm -f clanbomber.dat clanbomber.cfg | |
| 98 |