Browse Source

[hellfire] Rename item spawn functions

pull/876/head
Anders Jenbo 6 years ago
parent
commit
dad6d418e3
  1. 14
      Source/items.cpp
  2. 8
      Source/items.h
  3. 6
      Source/towners.cpp
  4. 8
      comparer-config/hellfire.toml

14
Source/items.cpp

@ -3012,7 +3012,7 @@ void SpawnRock()
} }
#ifdef HELLFIRE #ifdef HELLFIRE
void items_427DC6(int itemid, int xx, int yy) void SpawnRewardItem(int itemid, int xx, int yy)
{ {
int i; int i;
@ -3033,19 +3033,19 @@ void items_427DC6(int itemid, int xx, int yy)
numitems++; numitems++;
} }
void items_427E61(int xx, int yy) void SpawnMapOfDoom(int xx, int yy)
{ {
items_427DC6(IDI_MAPOFDOOM, xx, yy); SpawnRewardItem(IDI_MAPOFDOOM, xx, yy);
} }
void items_427E6F(int xx, int yy) void SpawnRuneBomb(int xx, int yy)
{ {
items_427DC6(IDI_RUNEBOMB, xx, yy); SpawnRewardItem(IDI_RUNEBOMB, xx, yy);
} }
void items_427E7D(int xx, int yy) void SpawnTheodore(int xx, int yy)
{ {
items_427DC6(IDI_THEODORE, xx, yy); SpawnRewardItem(IDI_THEODORE, xx, yy);
} }
#endif #endif

8
Source/items.h

@ -99,10 +99,10 @@ void items_427ABA(int x, int y);
void SpawnQuestItem(int itemid, int x, int y, int randarea, int selflag); void SpawnQuestItem(int itemid, int x, int y, int randarea, int selflag);
void SpawnRock(); void SpawnRock();
#ifdef HELLFIRE #ifdef HELLFIRE
void items_427DC6(int itemid, int xx, int yy); void SpawnRewardItem(int itemid, int xx, int yy);
void items_427E61(int xx, int yy); void SpawnMapOfDoom(int xx, int yy);
void items_427E6F(int xx, int yy); void SpawnRuneBomb(int xx, int yy);
void items_427E7D(int xx, int yy); void SpawnTheodore(int xx, int yy);
#endif #endif
void RespawnItem(int i, BOOL FlipFlag); void RespawnItem(int i, BOOL FlipFlag);
void DeleteItem(int ii, int i); void DeleteItem(int ii, int i);

6
Source/towners.cpp

@ -1108,7 +1108,7 @@ void TalkToTowner(int p, int t)
quests[QTYPE_FARMER]._qvar1 = 1; quests[QTYPE_FARMER]._qvar1 = 1;
quests[QTYPE_FARMER]._qlog = 1; quests[QTYPE_FARMER]._qlog = 1;
quests[QTYPE_FARMER]._qmsg = QUEST_FARMER1; quests[QTYPE_FARMER]._qmsg = QUEST_FARMER1;
items_427E6F(towner[t]._tx + 1, towner[t]._ty); SpawnRuneBomb(towner[t]._tx + 1, towner[t]._ty);
} }
break; break;
case 1: case 1:
@ -1135,7 +1135,7 @@ void TalkToTowner(int p, int t)
quests[QTYPE_FARMER]._qvar1 = 1; quests[QTYPE_FARMER]._qvar1 = 1;
quests[QTYPE_FARMER]._qlog = 1; quests[QTYPE_FARMER]._qlog = 1;
quests[QTYPE_FARMER]._qmsg = QUEST_FARMER1; quests[QTYPE_FARMER]._qmsg = QUEST_FARMER1;
items_427E6F(towner[t]._tx + 1, towner[t]._ty); SpawnRuneBomb(towner[t]._tx + 1, towner[t]._ty);
} }
break; break;
case 2: case 2:
@ -1222,7 +1222,7 @@ void TalkToTowner(int p, int t)
quests[QTYPE_JERSEY]._qmsg = QUEST_JERSEY4; quests[QTYPE_JERSEY]._qmsg = QUEST_JERSEY4;
quests[QTYPE_JERSEY]._qlog = 1; quests[QTYPE_JERSEY]._qlog = 1;
quests[QTYPE_JERSEY]._qvar1 = 1; quests[QTYPE_JERSEY]._qvar1 = 1;
items_427E6F(towner[t]._tx + 1, towner[t]._ty); SpawnRuneBomb(towner[t]._tx + 1, towner[t]._ty);
} }
break; break;
default: default:

8
comparer-config/hellfire.toml

@ -3158,22 +3158,22 @@ addr = 0x427CEE
size = 0xD8 size = 0xD8
[[func]] [[func]]
name = "items_427DC6" name = "SpawnItem"
addr = 0x427DC6 addr = 0x427DC6
size = 0x9B size = 0x9B
[[func]] [[func]]
name = "items_427E61" name = "SpawnMapOfDoom"
addr = 0x427E61 addr = 0x427E61
size = 0xE size = 0xE
[[func]] [[func]]
name = "items_427E6F" name = "SpawnRuneBomb"
addr = 0x427E6F addr = 0x427E6F
size = 0xE size = 0xE
[[func]] [[func]]
name = "items_427E7D" name = "SpawnTheodore"
addr = 0x427E7D addr = 0x427E7D
size = 0xE size = 0xE

Loading…
Cancel
Save