[Clonekeenplus-commits] [SCM] clonekeenplus branch, master, updated. 7ed1f10c85e32aecc463a4c1d34165
Commander Keen Interpreter
Brought to you by:
gerstrong
Menu
▾
▴
[Clonekeenplus-commits] [SCM] clonekeenplus branch, master, updated. 7ed1f10c85e32aecc463a4c1d3416528349cb4a5
|
From: Gerstrong <ger...@us...> - 2010-11-29 22:52:05
|
via 7ed1f10c85e32aecc463a4c1d3416528349cb4a5 (commit)
via e815c59bf0ed01f51627caf0ce092e7e7e694db5 (commit)
via 633f5d109feb3aa9309cd38be83b3ad7d8436398 (commit)
via f089a580f31bd16f036e2483838a2723d0472f78 (commit)
via ecffee125c57038e38238f50f2d7696e486f614d (commit)
via b8367dec0ab65e7ae0cca66b034eaddfc80b58f3 (commit)
via 72b1f4c6465079e8a00a519c444fbe7f00f6a097 (commit)
from 49bfca52b52101924fca807787aa6d6a8e8b1ebc (commit)
- Log -----------------------------------------------------------------
commit 7ed1f10c85e32aecc463a4c1d3416528349cb4a5
Author: Gerhard Stein <ger...@gm...>
Date: Mon Nov 29 23:15:21 2010 +0100
small fixes
commit e815c59bf0ed01f51627caf0ce092e7e7e694db5
Author: Gerhard Stein <ger...@gm...>
Date: Mon Nov 29 21:20:49 2010 +0100
HUD ist now fully working
commit 633f5d109feb3aa9309cd38be83b3ad7d8436398
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 27 23:54:25 2010 +0100
Draw digit code for the galaxy engine
commit f089a580f31bd16f036e2483838a2723d0472f78
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 27 23:43:23 2010 +0100
More HUD Code (Galaxy engine)
commit ecffee125c57038e38238f50f2d7696e486f614d
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 27 23:11:48 2010 +0100
added HUD Code in Galaxy Engine
commit b8367dec0ab65e7ae0cca66b034eaddfc80b58f3
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 27 22:48:48 2010 +0100
cleanups
commit 72b1f4c6465079e8a00a519c444fbe7f00f6a097
Author: Gerhard Stein <ger...@gm...>
Date: Thu Nov 25 19:44:38 2010 +0100
cleanups
-----------------------------------------------------------------------
Summary of changes:
src/common/CHUD.cpp | 71 +++++++++++++++++++++++++++--
src/common/CHUD.h | 12 +++--
src/common/CObjectCollision.cpp | 20 +++++++-
src/common/CStatusScreen.cpp | 14 +++---
src/common/Playerdefines.h | 7 ++-
src/engine/galaxy/CInventory.cpp | 11 ++++-
src/engine/galaxy/CInventory.h | 14 ++++--
src/engine/galaxy/CLevelPlay.cpp | 11 +++--
src/engine/galaxy/CLevelPlay.h | 5 +-
src/engine/galaxy/CMapLoaderGalaxy.cpp | 5 ++
src/engine/galaxy/CMapLoaderGalaxy.h | 5 ++
src/engine/galaxy/CMenuGalaxy.cpp | 6 +-
src/engine/galaxy/CPlayGameGalaxy.cpp | 6 +-
src/engine/galaxy/ai/CFlag.cpp | 4 ++
src/engine/galaxy/ai/CPlayerLevel.cpp | 23 +++++++---
src/engine/galaxy/ai/CPlayerLevel.h | 9 +---
src/engine/galaxy/ai/CSpriteItem.cpp | 21 ++++++++-
src/engine/vorticon/finale/CEndingEp1.cpp | 14 +++---
src/engine/vorticon/finale/CEndingEp2.cpp | 14 +++---
src/engine/vorticon/finale/CEndingEp3.cpp | 14 +++---
src/fileio/Oldsavegamestructs.h | 6 +-
21 files changed, 213 insertions(+), 79 deletions(-)
diff --git a/src/common/CHUD.cpp b/src/common/CHUD.cpp
index cd1c107..e4f35f4 100644
--- a/src/common/CHUD.cpp
+++ b/src/common/CHUD.cpp
@@ -22,7 +22,11 @@ mp_Background(NULL)
m_Rect.y = 2;
m_Rect.w = 80;
m_Rect.h = 29;
- CreateBackground();
+
+ size_t Episode = g_pBehaviorEngine->getEpisode();
+
+ if( Episode>=1 && Episode<=3 )
+ CreateBackground();
}
std::string getRightAligned(std::string text, size_t size)
@@ -103,15 +107,14 @@ void CHUD::CreateBackground()
DrawCircle(58, 15, 22);
}
+// Draw a circle on the surface
void CHUD::DrawCircle(int x, int y, int width)
{
SDL_Rect text, outline;
Uint8 r,g,b;
CFont &Font = g_pGfxEngine->getFont(0);
- //Uint32 bgcolor = Font.getBGColour(false);
Font.getBGColour(false, &r, &g, &b);
- //SDL_GetRGB(bgcolor, mp_Background->format, &r, &g, &b);
outline.x = x+4;
outline.y = y;
@@ -151,9 +154,54 @@ void CHUD::DrawCircle(int x, int y, int width)
}
/**
- * \brief This part of the code will render the entire HUD
+ * Draws some digits using galaxy style
*/
-void CHUD::render()
+void CHUD::drawDigits(const std::string& text, Uint16 x, Uint16 y)
+{
+ SDL_Surface *blitsurface = g_pVideoDriver->getBlitSurface();
+
+ CTilemap &Tilemap = g_pGfxEngine->getTileMap(2);
+
+ for(Uint16 i=0 ; i<text.size() ; i++)
+ {
+ char c = text[i];
+
+ if(c != ' ')
+ Tilemap.drawTile(blitsurface, x+i*8, y, 43+c-'1');
+ }
+}
+
+/**
+ * \brief This part of the code will render the entire HUD. Galaxy Version
+ */
+void CHUD::renderGalaxy()
+{
+ m_Rect.x = 4;
+ m_Rect.y = 2;
+ m_Rect.w = 80;
+ m_Rect.h = 29;
+
+ // Compute the score that really will be seen
+ int score, lives, charges;
+ score = (m_score<999999999) ? m_score : 999999999;
+ lives = (m_lives<99) ? m_lives : 99;
+ charges = (m_charges<99) ? m_charges : 99;
+
+ SDL_Surface *blitsurface = g_pVideoDriver->getBlitSurface();
+
+ // Draw the background
+ CSprite &HUDBox = g_pGfxEngine->getSprite(129);
+
+ HUDBox.drawSprite(blitsurface, m_Rect.x, m_Rect.y);
+
+ drawDigits(getRightAligned(itoa(score),9), m_Rect.x+8, m_Rect.y+4);
+ drawDigits(getRightAligned(itoa(charges),2), m_Rect.x+64, m_Rect.y+20);
+ drawDigits(getRightAligned(itoa(lives),2), m_Rect.x+24, m_Rect.y+20);
+}
+/**
+ * \brief This part of the code will render the entire HUD. Vorticon version
+ */
+void CHUD::renderVorticon()
{
// Compute the score that really will be seen
int score, lives, charges;
@@ -180,6 +228,19 @@ void CHUD::render()
Font.setFGColour(blitsurface->format, 0x0);
}
+/**
+ * \brief This part of the code will render the entire HUD
+ */
+void CHUD::render()
+{
+ size_t Episode = g_pBehaviorEngine->getEpisode();
+
+ if( Episode>=1 && Episode<=3 )
+ renderVorticon();
+ else if( Episode>=4 && Episode<=6 )
+ renderGalaxy();
+}
+
CHUD::~CHUD() {
if(mp_Background) SDL_FreeSurface(mp_Background);
diff --git a/src/common/CHUD.h b/src/common/CHUD.h
index e5c5820..1de678b 100644
--- a/src/common/CHUD.h
+++ b/src/common/CHUD.h
@@ -9,12 +9,13 @@
* or even another game can use it.
*/
-#ifndef CHUD_H_
-#define CHUD_H_
-
#include <SDL.h>
#include "Playerdefines.h"
-#include "../engine/spritedefines.h"
+#include "engine/spritedefines.h"
+#include <string>
+
+#ifndef CHUD_H_
+#define CHUD_H_
class CHUD {
public:
@@ -27,6 +28,9 @@ public:
private:
void CreateBackground();
+ void drawDigits(const std::string& text, Uint16 x, Uint16 y);
+ void renderGalaxy();
+ void renderVorticon();
void DrawCircle(int x, int y, int width);
SDL_Rect m_Rect;
diff --git a/src/common/CObjectCollision.cpp b/src/common/CObjectCollision.cpp
index d14c1a1..a0d4944 100644
--- a/src/common/CObjectCollision.cpp
+++ b/src/common/CObjectCollision.cpp
@@ -382,6 +382,7 @@ bool CObject::hitdetectWithTileProperty(Uint16 Property, Uint16 x, Uint16 y)
bool CObject::checkSolidR( int x1, int x2, int y1, int y2)
{
std::vector<CTileProperties> &TileProperty = g_pBehaviorEngine->getTileProperties();
+ bool vorticon = (g_pBehaviorEngine->getEpisode() <= 3);
x2 += COLISION_RES;
@@ -403,7 +404,15 @@ bool CObject::checkSolidR( int x1, int x2, int y1, int y2)
if( m_type == OBJ_PLAYER && solid )
{
- if( x2 >= (int)((mp_Map->m_width-2)<<CSF) ) return true;
+ if(vorticon)
+ {
+ if( x2 >= (int)((mp_Map->m_width-2)<<CSF) ) return true;
+ }
+ else
+ {
+ if( x2 >= (int)((mp_Map->m_width-1)<<CSF) ) return true;
+ }
+
}
else
{
@@ -448,7 +457,14 @@ bool CObject::checkSolidL( int x1, int x2, int y1, int y2)
if( m_type == OBJ_PLAYER && solid )
{
- if( x1 <= (2<<CSF) ) return true;
+ if(vorticon)
+ {
+ if( x1 <= (2<<CSF) ) return true;
+ }
+ else
+ {
+ if( x1 <= (1<<CSF) ) return true;
+ }
}
else
{
diff --git a/src/common/CStatusScreen.cpp b/src/common/CStatusScreen.cpp
index 04215ac..caf18dd 100644
--- a/src/common/CStatusScreen.cpp
+++ b/src/common/CStatusScreen.cpp
@@ -10,13 +10,13 @@
*/
#include "CStatusScreen.h"
-#include "../graphics/CGfxEngine.h"
-#include "../sdl/CVideoDriver.h"
-#include "../StringUtils.h"
-#include "../common/Playerdefines.h"
-#include "../common/CBehaviorEngine.h"
-#include "../graphics/effects/CColorMerge.h"
-#include "../engine/vorticon/ai/CAnkhShield.h"
+#include "graphics/CGfxEngine.h"
+#include "sdl/CVideoDriver.h"
+#include "StringUtils.h"
+#include "common/Playerdefines.h"
+#include "common/CBehaviorEngine.h"
+#include "graphics/effects/CColorMerge.h"
+#include "engine/vorticon/ai/CAnkhShield.h"
#define FADE_SPEED 10
diff --git a/src/common/Playerdefines.h b/src/common/Playerdefines.h
index 5a99162..d42b2b5 100644
--- a/src/common/Playerdefines.h
+++ b/src/common/Playerdefines.h
@@ -9,11 +9,12 @@
#define PLAYERDEFINES_H_
enum player_actions{
-PA_X, PA_Y,
+PA_X = 0,
+PA_Y,
PA_JUMP, PA_POGO,
-PA_FIRE, PA_STATUS
+PA_FIRE, PA_STATUS,
+PA_MAX_ACTIONS
};
-#define PA_MAX_ACTIONS 6
// upon starting to walk, keen will quickly increase to
// PFASTINCMAXSPEED. keen can, at a slower rate,
diff --git a/src/engine/galaxy/CInventory.cpp b/src/engine/galaxy/CInventory.cpp
index 1684441..0497693 100644
--- a/src/engine/galaxy/CInventory.cpp
+++ b/src/engine/galaxy/CInventory.cpp
@@ -7,7 +7,9 @@
#include "CInventory.h"
-CInventory::CInventory()
+
+CInventory::CInventory() :
+m_HUD(m_points, m_lifes, m_bullets)
{
reset();
}
@@ -29,3 +31,10 @@ void CInventory::reset()
m_special.ep4.elders = 0;
m_special.ep4.swimsuit = 0;
}
+
+void CInventory::drawHUD()
+{
+ m_HUD.render();
+}
+
+
diff --git a/src/engine/galaxy/CInventory.h b/src/engine/galaxy/CInventory.h
index 3afc0c2..7cf9baf 100644
--- a/src/engine/galaxy/CInventory.h
+++ b/src/engine/galaxy/CInventory.h
@@ -8,20 +8,23 @@
* the one for vorticon is memory fixed for savegames.
*/
+
#ifndef CINVENTORY_H_
#define CINVENTORY_H_
+#include "common/CHUD.h"
+
class CInventory {
public:
CInventory();
-
void reset();
+ void drawHUD();
- int m_lifes;
- int m_points;
+ signed char m_lifes;
+ unsigned long m_points;
int m_lifeAt;
int m_drops;
- int m_bullets;
+ unsigned int m_bullets;
struct {
int red;
int blue;
@@ -45,6 +48,9 @@ public:
bool rocketKeycard;
}ep6;
}m_special;
+
+ CHUD m_HUD;
};
+
#endif /* CINVENTORY_H_ */
diff --git a/src/engine/galaxy/CLevelPlay.cpp b/src/engine/galaxy/CLevelPlay.cpp
index f081ee6..40b630e 100644
--- a/src/engine/galaxy/CLevelPlay.cpp
+++ b/src/engine/galaxy/CLevelPlay.cpp
@@ -12,9 +12,10 @@
namespace galaxy {
-CLevelPlay::CLevelPlay(CExeFile &ExeFile) :
+CLevelPlay::CLevelPlay(CExeFile &ExeFile, CInventory &Inventory) :
m_active(false),
-m_ExeFile(ExeFile)
+m_ExeFile(ExeFile),
+m_Inventory(Inventory)
{ }
bool CLevelPlay::isActive()
@@ -23,10 +24,10 @@ bool CLevelPlay::isActive()
void CLevelPlay::setActive(bool value)
{ m_active = value; }
-bool CLevelPlay::loadLevel(Uint16 level, CInventory &Inventory)
+bool CLevelPlay::loadLevel(Uint16 level)
{
// Load the World map level.
- CMapLoaderGalaxy MapLoader(m_ExeFile, m_ObjectPtr, Inventory);
+ CMapLoaderGalaxy MapLoader(m_ExeFile, m_ObjectPtr, m_Inventory);
m_Map.setScrollSurface(g_pVideoDriver->getScrollSurface());
MapLoader.loadMap(m_Map, level);
@@ -78,6 +79,8 @@ void CLevelPlay::process()
if(!(*obj)->honorPriority)
(*obj)->draw();
}
+
+ m_Inventory.drawHUD();
}
}
diff --git a/src/engine/galaxy/CLevelPlay.h b/src/engine/galaxy/CLevelPlay.h
index 1927e43..aa8b04d 100644
--- a/src/engine/galaxy/CLevelPlay.h
+++ b/src/engine/galaxy/CLevelPlay.h
@@ -19,11 +19,11 @@ namespace galaxy {
class CLevelPlay {
public:
- CLevelPlay(CExeFile &ExeFile);
+ CLevelPlay(CExeFile &ExeFile, CInventory &Inventory);
bool isActive();
void setActive(bool value);
- bool loadLevel(Uint16 level, CInventory &Inventory);
+ bool loadLevel(Uint16 level);
void process();
@@ -33,6 +33,7 @@ private:
CMap m_Map;
CExeFile &m_ExeFile;
+ CInventory &m_Inventory;
};
}
diff --git a/src/engine/galaxy/CMapLoaderGalaxy.cpp b/src/engine/galaxy/CMapLoaderGalaxy.cpp
index ad6a81d..4affd7d 100644
--- a/src/engine/galaxy/CMapLoaderGalaxy.cpp
+++ b/src/engine/galaxy/CMapLoaderGalaxy.cpp
@@ -25,6 +25,9 @@
#include <fstream>
+namespace galaxy
+{
+
CMapLoaderGalaxy::CMapLoaderGalaxy(CExeFile &ExeFile, std::vector<CObject*>& ObjectPtr, CInventory &Inventory):
m_ExeFile(ExeFile),
m_ObjectPtr(ObjectPtr),
@@ -367,3 +370,5 @@ void CMapLoaderGalaxy::addFoe(CMap &Map, word foe, size_t x, size_t y)
if(p_newfoe)
m_ObjectPtr.push_back(p_newfoe);
}
+
+}
diff --git a/src/engine/galaxy/CMapLoaderGalaxy.h b/src/engine/galaxy/CMapLoaderGalaxy.h
index 5f9a796..542145b 100644
--- a/src/engine/galaxy/CMapLoaderGalaxy.h
+++ b/src/engine/galaxy/CMapLoaderGalaxy.h
@@ -18,6 +18,9 @@
#include <string>
#include <SDL.h>
+namespace galaxy
+{
+
class CMapLoaderGalaxy
{
public:
@@ -39,4 +42,6 @@ private:
CInventory &m_Inventory;
};
+}
+
#endif /* CMAPLOADERGALAXY_H_ */
diff --git a/src/engine/galaxy/CMenuGalaxy.cpp b/src/engine/galaxy/CMenuGalaxy.cpp
index 71e3123..425b211 100644
--- a/src/engine/galaxy/CMenuGalaxy.cpp
+++ b/src/engine/galaxy/CMenuGalaxy.cpp
@@ -7,9 +7,9 @@
#include "CMenuGalaxy.h"
-#include "../../graphics/CGfxEngine.h"
-#include "../../sdl/CVideoDriver.h"
-#include "../../sdl/CInput.h"
+#include "graphics/CGfxEngine.h"
+#include "sdl/CVideoDriver.h"
+#include "sdl/CInput.h"
namespace galaxy
{
diff --git a/src/engine/galaxy/CPlayGameGalaxy.cpp b/src/engine/galaxy/CPlayGameGalaxy.cpp
index 42f47ed..08d14bc 100644
--- a/src/engine/galaxy/CPlayGameGalaxy.cpp
+++ b/src/engine/galaxy/CPlayGameGalaxy.cpp
@@ -21,7 +21,7 @@ CPlayGameGalaxy::CPlayGameGalaxy(CExeFile &ExeFile, char level,
stOption *p_option, CSavedGame &SavedGame) :
CPlayGame(ExeFile, level, numplayers, difficulty, p_option),
m_WorldMap(ExeFile, m_Inventory),
-m_LevelPlay(ExeFile),
+m_LevelPlay(ExeFile, m_Inventory),
mp_Menu(NULL),
m_SavedGame(SavedGame)
{
@@ -42,7 +42,7 @@ bool CPlayGameGalaxy::init()
else
{
// manually a level has been loaded
- m_LevelPlay.loadLevel(m_Level, m_Inventory);
+ m_LevelPlay.loadLevel(m_Level);
m_LevelPlay.setActive(true);
return true;
}
@@ -103,7 +103,7 @@ void CPlayGameGalaxy::process()
if(ev->data > 0xC000)
{
m_WorldMap.setActive(false);
- m_LevelPlay.loadLevel(ev->data - 0xC000, m_Inventory);
+ m_LevelPlay.loadLevel(ev->data - 0xC000);
m_LevelPlay.setActive(true);
}
EventContainer.pop_Event();
diff --git a/src/engine/galaxy/ai/CFlag.cpp b/src/engine/galaxy/ai/CFlag.cpp
index e10b169..b20abc8 100644
--- a/src/engine/galaxy/ai/CFlag.cpp
+++ b/src/engine/galaxy/ai/CFlag.cpp
@@ -26,11 +26,15 @@ processState(&CFlag::processFlying)
solid = false;
honorPriority = false;
+
// Here we move the coordinates in order get it positioned correctly in the pole
m_destination.x += (6<<STC);
CSprite &Sprite = g_pGfxEngine->getSprite(WAVING_BASEFRAME);
+ sprite = WAVING_BASEFRAME;
+ calcBouncingBoxes();
m_destination.y -= Sprite.m_bboxY2;
m_destination.y += (1<<STC);
+ m_destination.y -= (6<<STC);
}
/**
diff --git a/src/engine/galaxy/ai/CPlayerLevel.cpp b/src/engine/galaxy/ai/CPlayerLevel.cpp
index 315e67c..6934064 100644
--- a/src/engine/galaxy/ai/CPlayerLevel.cpp
+++ b/src/engine/galaxy/ai/CPlayerLevel.cpp
@@ -11,10 +11,6 @@
#include "sdl/CInput.h"
#include "CVec.h"
-// TODO: Needs recoding. This was just for testing, but now we need something much more
-// serious. I want to create a diagram to represent all actions that keen can do and code them
-// here according to that diagram. Something like UML or Petri. This Code got a bit out of control
-
namespace galaxy {
const Uint16 MAX_JUMPHEIGHT = 30;
@@ -32,13 +28,13 @@ const int POGO_START_INERTIA_IMPOSSIBLE = -200;
CPlayerLevel::CPlayerLevel(CMap *pmap, Uint32 x, Uint32 y,
std::vector<CObject*>& ObjectPtrs, direction_t facedir,
CInventory &l_Inventory) :
-CObject(pmap, x, y, OBJ_NONE),
+CObject(pmap, x, y, OBJ_PLAYER),
+m_Inventory(l_Inventory),
m_animation(0),
m_animation_time(1),
m_animation_ticker(0),
m_ObjectPtrs(ObjectPtrs),
-m_cliff_hanging(false),
-m_Inventory(l_Inventory)
+m_cliff_hanging(false)
{
m_index = 0;
m_timer = 0;
@@ -718,6 +714,19 @@ void CPlayerLevel::processLevelMiscFlagsCheck()
const int lc_y = l_y>>CSF;
mp_Map->setTile( lc_x, lc_y, 0, true, 1 );
m_ObjectPtrs.push_back(new CItemEffect(mp_Map, lc_x<<CSF, lc_y<<CSF, got_sprite_item_pics[4+i-21]));
+
+ switch(i)
+ {
+ case 21: m_Inventory.m_points += 100; break;
+ case 22: m_Inventory.m_points += 200; break;
+ case 23: m_Inventory.m_points += 500; break;
+ case 24: m_Inventory.m_points += 1000; break;
+ case 25: m_Inventory.m_points += 2000; break;
+ case 26: m_Inventory.m_points += 5000; break;
+ case 27: m_Inventory.m_lifes++; break;
+ case 28: m_Inventory.m_bullets += 5; break;
+ default: break;
+ }
}
}
}
diff --git a/src/engine/galaxy/ai/CPlayerLevel.h b/src/engine/galaxy/ai/CPlayerLevel.h
index 541e2d9..134da09 100644
--- a/src/engine/galaxy/ai/CPlayerLevel.h
+++ b/src/engine/galaxy/ai/CPlayerLevel.h
@@ -9,19 +9,12 @@
#define CPLAYERLEVEL_H_
#include "common/CObject.h"
+#include "common/Playerdefines.h"
#include "engine/CEvent.h"
#include "engine/galaxy/CInventory.h"
namespace galaxy {
-enum player_actions{
-PA_X = 0,
-PA_Y,
-PA_JUMP, PA_POGO,
-PA_FIRE, PA_STATUS,
-PA_MAX_ACTIONS
-};
-
#define A_KEEN_STAND 0
#define A_KEEN_BORED 1
#define A_KEEN_QUESTION 2
diff --git a/src/engine/galaxy/ai/CSpriteItem.cpp b/src/engine/galaxy/ai/CSpriteItem.cpp
index f5ab7f5..753783e 100644
--- a/src/engine/galaxy/ai/CSpriteItem.cpp
+++ b/src/engine/galaxy/ai/CSpriteItem.cpp
@@ -48,18 +48,35 @@ void CSpriteItem::getTouchedBy(CObject &theObject)
{
exists = false;
- //CPlayerLevel &Player = dynamic_cast<CPlayerLevel&>(theObject);
+ if(theObject.m_type != OBJ_PLAYER)
+ return;
+
CPlayerLevel *pPlayer = (CPlayerLevel*)(&theObject);
- Uint32 newanimsprite = got_sprite_item_pics[0];
/// Calculate the right animation.
// Point items
+ Uint32 newanimsprite = got_sprite_item_pics[0];
if( m_basesprite >= 103 && m_basesprite <= 116 )
+ {
newanimsprite = got_sprite_item_pics[4+(m_basesprite-103)/2];
+ switch(m_basesprite)
+ {
+ case 103: pPlayer->m_Inventory.m_points += 100; break;
+ case 105: pPlayer->m_Inventory.m_points += 200; break;
+ case 107: pPlayer->m_Inventory.m_points += 500; break;
+ case 109: pPlayer->m_Inventory.m_points += 1000; break;
+ case 111: pPlayer->m_Inventory.m_points += 2000; break;
+ case 113: pPlayer->m_Inventory.m_points += 5000; break;
+ default: break;
+ }
+ }
// raygun
if( m_basesprite >= 127 && m_basesprite <= 128 )
+ {
+ pPlayer->m_Inventory.m_bullets += 5;
newanimsprite = got_sprite_item_pics[11];
+ }
m_ObjectPtrs.push_back(new CItemEffect(mp_Map, getXPosition(), getYPosition(), newanimsprite));
diff --git a/src/engine/vorticon/finale/CEndingEp1.cpp b/src/engine/vorticon/finale/CEndingEp1.cpp
index 86c3c47..8870e06 100644
--- a/src/engine/vorticon/finale/CEndingEp1.cpp
+++ b/src/engine/vorticon/finale/CEndingEp1.cpp
@@ -6,13 +6,13 @@
*/
#include "CEndingEp1.h"
-#include "../../../StringUtils.h"
-#include "../../../sdl/CTimer.h"
-#include "../../../sdl/CInput.h"
-#include "../../../sdl/CVideoDriver.h"
-#include "../../../graphics/CGfxEngine.h"
-#include "../../../common/CMapLoader.h"
-#include "../../../common/Playerdefines.h"
+#include "StringUtils.h"
+#include "sdl/CTimer.h"
+#include "sdl/CInput.h"
+#include "sdl/CVideoDriver.h"
+#include "graphics/CGfxEngine.h"
+#include "common/CMapLoader.h"
+#include "common/Playerdefines.h"
CEndingEp1::CEndingEp1(CMap &map, std::vector<CPlayer> &Player, bool &hideobjects) :
CFinale(map),
diff --git a/src/engine/vorticon/finale/CEndingEp2.cpp b/src/engine/vorticon/finale/CEndingEp2.cpp
index 484f271..7ffd831 100644
--- a/src/engine/vorticon/finale/CEndingEp2.cpp
+++ b/src/engine/vorticon/finale/CEndingEp2.cpp
@@ -6,13 +6,13 @@
*/
#include "CEndingEp2.h"
-#include "../../../StringUtils.h"
-#include "../../../sdl/CTimer.h"
-#include "../../../sdl/CInput.h"
-#include "../../../sdl/CVideoDriver.h"
-#include "../../../graphics/CGfxEngine.h"
-#include "../../../common/CMapLoader.h"
-#include "../../../common/Playerdefines.h"
+#include "StringUtils.h"
+#include "sdl/CTimer.h"
+#include "sdl/CInput.h"
+#include "sdl/CVideoDriver.h"
+#include "graphics/CGfxEngine.h"
+#include "common/CMapLoader.h"
+#include "common/Playerdefines.h"
const int LIMPSHOME_X = 0;
const int LIMPSHOME_Y = 300;
diff --git a/src/engine/vorticon/finale/CEndingEp3.cpp b/src/engine/vorticon/finale/CEndingEp3.cpp
index 971cbcd..143fd64 100644
--- a/src/engine/vorticon/finale/CEndingEp3.cpp
+++ b/src/engine/vorticon/finale/CEndingEp3.cpp
@@ -6,13 +6,13 @@
*/
#include "CEndingEp3.h"
-#include "../../../StringUtils.h"
-#include "../../../sdl/CInput.h"
-#include "../../../sdl/CVideoDriver.h"
-#include "../../../graphics/effects/CFlash.h"
-#include "../../../graphics/CGfxEngine.h"
-#include "../../../common/CMapLoader.h"
-#include "../../../common/Playerdefines.h"
+#include "StringUtils.h"
+#include "sdl/CInput.h"
+#include "sdl/CVideoDriver.h"
+#include "graphics/effects/CFlash.h"
+#include "graphics/CGfxEngine.h"
+#include "common/CMapLoader.h"
+#include "common/Playerdefines.h"
CEndingEp3::CEndingEp3(CMap &map, std::vector<CPlayer> &Player) :
CFinale(map),
diff --git a/src/fileio/Oldsavegamestructs.h b/src/fileio/Oldsavegamestructs.h
index 8009ead..8d3106e 100644
--- a/src/fileio/Oldsavegamestructs.h
+++ b/src/fileio/Oldsavegamestructs.h
@@ -17,9 +17,9 @@
#ifndef OLDSAVEGAMESTRUCTS_H_
#define OLDSAVEGAMESTRUCTS_H_
-#include "../keen.h"
-#include "../common/Playerdefines.h"
-#include "../common/inventory.h"
+#include "keen.h"
+#include "common/Playerdefines.h"
+#include "common/inventory.h"
struct OldSaveGameFormatV5
{
hooks/post-receive
--
clonekeenplus
|