Skip to content

Commit 4ab1f87

Browse files
authored
Merge pull request #3309 from ToolMan2k/GetGameInfo
Maniacs Feature - Partially implement command GetGameInfo (3021)
2 parents 8038b7b + 8ed2054 commit 4ab1f87

File tree

7 files changed

+259
-18
lines changed

7 files changed

+259
-18
lines changed

src/game_actor.h

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,46 +243,93 @@ class Game_Actor final : public Game_Battler {
243243
*/
244244
StringView GetName() const override;
245245

246+
/**
247+
* Gets actor name from the database.
248+
*
249+
* @return name.
250+
*/
251+
StringView GetOriginalName() const;
252+
246253
/**
247254
* Gets actor character sprite filename.
248255
*
249256
* @return character sprite filename.
250257
*/
251258
StringView GetSpriteName() const override;
252259

260+
/**
261+
* Gets actor character sprite filename from the database.
262+
*
263+
* @return character sprite filename.
264+
*/
265+
StringView GetOriginalSpriteName() const;
266+
253267
/**
254268
* Gets actor character sprite index.
255269
*
256270
* @return character sprite index.
257271
*/
258272
int GetSpriteIndex() const;
259273

274+
/**
275+
* Gets actor character sprite index from the database.
276+
*
277+
* @return character sprite index.
278+
*/
279+
int GetOriginalSpriteIndex() const;
280+
260281
/**
261282
* Gets the transparency level of the actor sprite
262283
*/
263284
int GetSpriteTransparency() const;
264285

286+
/**
287+
* Gets the transparency level of the actor sprite from the database.
288+
*/
289+
int GetOriginalSpriteTransparency() const;
290+
265291
/**
266292
* Gets actor face graphic filename.
267293
*
268294
* @return face graphic filename.
269295
*/
270296
StringView GetFaceName() const;
271297

298+
/**
299+
* Gets actor face graphic filename from the database.
300+
*
301+
* @return face graphic filename.
302+
*/
303+
StringView GetOriginalFaceName() const;
304+
272305
/**
273306
* Gets actor face graphic index.
274307
*
275308
* @return face graphic index.
276309
*/
277310
int GetFaceIndex() const;
278311

312+
/**
313+
* Gets actor face graphic index from the database.
314+
*
315+
* @return face graphic index.
316+
*/
317+
int GetOriginalFaceIndex() const;
318+
279319
/**
280320
* Gets actor title.
281321
*
282322
* @return title.
283323
*/
284324
StringView GetTitle() const;
285325

326+
/**
327+
* Gets actor title from the database.
328+
*
329+
* @return title.
330+
*/
331+
StringView GetOriginalTitle() const;
332+
286333
/**
287334
* Gets actor equipped weapon ID.
288335
*
@@ -960,6 +1007,10 @@ inline StringView Game_Actor::GetName() const {
9601007
: StringView(dbActor->name);
9611008
}
9621009

1010+
inline StringView Game_Actor::GetOriginalName() const {
1011+
return dbActor->name;
1012+
}
1013+
9631014
inline void Game_Actor::SetTitle(const std::string &new_title) {
9641015
data.title = (new_title != dbActor->title)
9651016
? new_title
@@ -972,36 +1023,60 @@ inline StringView Game_Actor::GetTitle() const {
9721023
: StringView(dbActor->title);
9731024
}
9741025

1026+
inline StringView Game_Actor::GetOriginalTitle() const {
1027+
return dbActor->title;
1028+
}
1029+
9751030
inline StringView Game_Actor::GetSpriteName() const {
9761031
return (!data.sprite_name.empty())
9771032
? StringView(data.sprite_name)
9781033
: StringView(dbActor->character_name);
9791034
}
9801035

1036+
inline StringView Game_Actor::GetOriginalSpriteName() const {
1037+
return dbActor->character_name;
1038+
}
1039+
9811040
inline int Game_Actor::GetSpriteIndex() const {
9821041
return (!data.sprite_name.empty())
9831042
? data.sprite_id
9841043
: dbActor->character_index;
9851044
}
9861045

1046+
inline int Game_Actor::GetOriginalSpriteIndex() const {
1047+
return dbActor->character_index;
1048+
}
1049+
9871050
inline int Game_Actor::GetSpriteTransparency() const {
9881051
return (!data.sprite_name.empty())
9891052
? data.transparency
9901053
: (dbActor->transparent ? 3 : 0);
9911054
}
9921055

1056+
inline int Game_Actor::GetOriginalSpriteTransparency() const {
1057+
return dbActor->transparent ? 3 : 0;
1058+
}
1059+
9931060
inline StringView Game_Actor::GetFaceName() const {
9941061
return (!data.face_name.empty())
9951062
? StringView(data.face_name)
9961063
: StringView(dbActor->face_name);
9971064
}
9981065

1066+
inline StringView Game_Actor::GetOriginalFaceName() const {
1067+
return dbActor->face_name;
1068+
}
1069+
9991070
inline int Game_Actor::GetFaceIndex() const {
10001071
return (!data.face_name.empty())
10011072
? data.face_id
10021073
: dbActor->face_index;
10031074
}
10041075

1076+
inline int Game_Actor::GetOriginalFaceIndex() const {
1077+
return dbActor->face_index;
1078+
}
1079+
10051080
inline int Game_Actor::GetLevel() const {
10061081
return data.level;
10071082
}

0 commit comments

Comments
 (0)