This commit is contained in:
parent
ff8ebd213b
commit
f93f6f0643
6 changed files with 187 additions and 12 deletions
|
@ -17,6 +17,13 @@
|
|||
|
||||
#include "thing\thing.h"
|
||||
|
||||
#ifndef __PLAYER_PLAYER_H__
|
||||
#include "player\player.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GAME_GAME_H__
|
||||
#include "game\game.h"
|
||||
#endif
|
||||
|
||||
/* Std Lib
|
||||
------- */
|
||||
|
@ -109,6 +116,13 @@ void CThingManager::thinkAllThings(int _frames)
|
|||
}
|
||||
}
|
||||
|
||||
CPlayer *player = GameScene.getPlayer();
|
||||
|
||||
if ( player )
|
||||
{
|
||||
player->clearPlatform();
|
||||
}
|
||||
|
||||
// Player -> Pickup collision
|
||||
thing1=s_thingLists[CThing::TYPE_PICKUP];
|
||||
thing2=s_thingLists[CThing::TYPE_PLAYER];
|
||||
|
@ -307,7 +321,7 @@ void CThing::think(int _frames)
|
|||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
#ifdef __USER_paul__
|
||||
#if defined (__USER_paul__) || defined (__USER_charles__)
|
||||
int showthings=true;
|
||||
#include "gfx\prim.h"
|
||||
#include "level\level.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue