From 277dab29b736f5c70aaa4c54a494ae0e3761a7a6 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 15 Jan 2001 15:47:48 +0000 Subject: [PATCH] --- makefile.gfx | 4 ++-- source/player/player.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/makefile.gfx b/makefile.gfx index fa0ea0ef0..6d6efe492 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -121,9 +121,9 @@ ANIM_OUT_DIR := $(DATA_OUT)/anims PLAYER_ANIM_IN_DIR := $(ACTOR_IN_DIR)/SpongeBob/SbAnim # duff -# idlegeneric02 idlegeneric05 +# idlegeneric02 idlegeneric05 idlegeneric03 PLAYER_ANIM_LIST := buttbounce deathelectric deathfall electricshock fall fireaim firerecoill float getup hitground01 hover idleboots idlecoral \ - idlecoral01 idlegeneric01 idlegeneric03 idlegeneric04 idlelauncher idlenet jumpend jumpstart karate \ + idlecoral01 idlegeneric01 idlegeneric04 idlelauncher idlenet jumpend jumpstart karate \ knockback knockforward netfirelob netswipe netswipejump run runjumpend runjumpstart runstart runstop soakup teeterback teeterfront wakeup PLAYER_ANIM_IN := $(foreach FILE, $(PLAYER_ANIM_LIST),$(PLAYER_ANIM_IN_DIR)/$(FILE).gin) diff --git a/source/player/player.cpp b/source/player/player.cpp index 9fd4e84fb..13075e290 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -20,8 +20,6 @@ CPlayer::CPlayer() { SetRenderObj(&Skel); - SetAnimateObj(&Skel); - }; /*****************************************************************************/