diff options
| -rw-r--r-- | src/magic.cc | 17 | ||||
| -rw-r--r-- | src/main.cc | 4 | ||||
| -rw-r--r-- | src/script.cc | 26 |
3 files changed, 7 insertions, 40 deletions
diff --git a/src/magic.cc b/src/magic.cc index ca7aaec..0f36bee 100644 --- a/src/magic.cc +++ b/src/magic.cc @@ -3312,16 +3312,6 @@ void HomeTeleport(TCreature *Actor, const char *Name){ // Spell Casting // ============================================================================= -static void SpellFailed(uint32 CreatureID){ - TCreature *Actor = GetCreature(CreatureID); - if(Actor == NULL){ - error("SpellFailed: Kreatur existiert nicht.\n"); - return; - } - - GraphicalEffect(Actor->posx, Actor->posy, Actor->posz, EFFECT_POFF); -} - static void CharacterRightSpell(uint32 CreatureID, int SpellNr, const char (*SpellStr)[512]){ TCreature *Actor = GetCreature(CreatureID); if(Actor == NULL){ @@ -4288,12 +4278,13 @@ void UseMagicItem(uint32 CreatureID, Object Obj, Object Dest){ } } }catch(RESULT r){ - // TODO(fusion): Same as with `CheckForSpell` except that `Actor` is - // already in scope. if(r != ERROR){ GraphicalEffect(Actor->posx, Actor->posy, Actor->posz, EFFECT_POFF); } - SendResult(Actor->Connection, r); + + if(Actor->Type == PLAYER){ + SendResult(Actor->Connection, r); + } return; } diff --git a/src/main.cc b/src/main.cc index 2875e94..43137bc 100644 --- a/src/main.cc +++ b/src/main.cc @@ -85,13 +85,15 @@ static void DefaultHandler(int signr){ Reboot = false; } +#if 0 // TODO(fusion): This function was exported in the binary but not referenced anywhere. static void ErrorHandler(int signr){ error("ErrorHandler: SigNr. %d: %s\n", signr, sigdescr_np(signr)); EndGame(); LogoutAllPlayers(); - exit(1); + exit(EXIT_FAILURE); } +#endif static void InitSignalHandler(void){ int count = 0; diff --git a/src/script.cc b/src/script.cc index 5606107..75eab55 100644 --- a/src/script.cc +++ b/src/script.cc @@ -554,32 +554,6 @@ char TReadScriptFile::getSpecial(void){ return this->Special; } -// TODO(fusion): REMOVE. This is a snippet to test the script lexer. -int main(int argc, char **argv){ - TReadScriptFile Script; - Script.open("local/alexander.npc"); - while(true){ - Script.nextToken(); - if(Script.Token == ENDOFFILE){ - printf("EOF\n"); - Script.close(); - break; - } - - switch(Script.Token){ - case IDENTIFIER: printf("IDENTIFIER \"%s\"\n", Script.String); break; - case NUMBER: printf("NUMBER %d\n", Script.Number); break; - case STRING: printf("STRING \"%s\"\n", Script.String); break; - case BYTES: printf("BYTES %u-%u-%u-%u-%u\n", Script.Bytes[0], Script.Bytes[1], Script.Bytes[2], Script.Bytes[3], Script.Bytes[4]); break; - case COORDINATE: printf("COORD [%d,%d,%d]\n", Script.CoordX, Script.CoordY, Script.CoordZ); break; - case SPECIAL: printf("SPECIAL '%c'\n", Script.Special); break; - default: printf("UNKNOWN TOKEN %d\n", Script.Token); break; - } - } - - return EXIT_FAILURE; -} - // TWriteScriptFile //============================================================================== TWriteScriptFile::TWriteScriptFile(void){ |