summaryrefslogtreecommitdiff
path: root/src/base/item.c
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-17 20:49:03 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-17 20:49:03 +0000
commit77465c2629ef63629d69c97a0af60a47a07ce7f5 (patch)
tree3d361898d0f29f4b789e52682e0945c741df6cb0 /src/base/item.c
parentb6af4e925f4cf9dd284728e846b99e1de776ec31 (diff)
- opravena chyba, tux mophol pomocou bombballu vybuchnuteho v objekte do ktoreho sa dostal ako duch pridavat itemy
- kod namiesto SDL_Surface pouziva moj typ image_t git-svn-id: http://opensvn.csie.org/tuxanci_ng@154 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src/base/item.c')
-rw-r--r--src/base/item.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/base/item.c b/src/base/item.c
index ef83066..c341754 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -33,7 +33,7 @@
#endif
#ifndef PUBLIC_SERVER
-static SDL_Surface *g_item[ITEM_COUNT];
+static image_t *g_item[ITEM_COUNT];
#endif
static bool_t isItemInit = FALSE;
@@ -512,6 +512,8 @@ static void action_giveitem(space_t *space, item_t *item, tux_t *tux)
}
delObjectFromSpaceWithObject(space, item, destroyItem);
+
+ addNewItem(space, ID_UNKNOWN);
break;
case ITEM_MINE :
@@ -543,10 +545,10 @@ static void action_giveitem(space_t *space, item_t *item, tux_t *tux)
}
delObjectFromSpaceWithObject(space, item, destroyItem);
+
+ addNewItem(space, ID_UNKNOWN);
break;
}
-
- addNewItem(space, ID_UNKNOWN);
}
void eventGiveTuxListItem(tux_t *tux, space_t *spaceItem)
@@ -558,7 +560,7 @@ void eventGiveTuxListItem(tux_t *tux, space_t *spaceItem)
if( getNetTypeGame() == NET_GAME_TYPE_CLIENT )
{
- return;
+ return;
}
if( tux->status == TUX_STATUS_DEAD )