* Cleanup of COORD.cpp

* Show Credits and move tab in the right place
This commit is contained in:
Ben Lankamp
2020-06-14 16:11:07 +02:00
parent 8e573d5db8
commit ef38daafef
7 changed files with 65 additions and 299 deletions
+4 -17
View File
@@ -85,7 +85,8 @@ CreditClass::CreditClass(void) :
//#define WW 50
void CreditClass::Graphic_Logic(bool forced)
{
if (forced || IsToRedraw) {
if (forced || IsToRedraw)
{
BStart(BENCH_TABS);
int xx = SeenBuff.Get_Width() - (120 * RESFACTOR);
@@ -112,12 +113,8 @@ void CreditClass::Graphic_Logic(bool forced)
/*
** Display the new current value.
*/
// PG TabClass::Draw_Credits_Tab();
#ifdef WIN32
//PG Fancy_Text_Print("%ld", xx, 0, &MetalScheme, TBLACK, TPF_METAL12 | TPF_CENTER | TPF_USE_GRAD_PAL, Current);
#else
Fancy_Text_Print("%ld", xx, 0, &ColorRemaps[PCOLOR_GREY], TBLACK, TPF_NOSHADOW|TPF_6PT_GRAD|TPF_CENTER|TPF_BRIGHT_COLOR, Current);
#endif //WIN32
TabClass::Draw_Credits_Tab();
Fancy_Text_Print("%ld", xx, 0, &MetalScheme, TBLACK, TPF_METAL12 | TPF_CENTER | TPF_USE_GRAD_PAL, Current);
if (Scen.MissionTimer.Is_Active()) {
long secs = Scen.MissionTimer / TICKS_PER_SECOND;
@@ -143,20 +140,12 @@ void CreditClass::Graphic_Logic(bool forced)
Speak(vox);
Map.FlasherTimer = 7;
}
#ifdef WIN32
if (hours) {
Fancy_Text_Print(TXT_TIME_FORMAT_HOURS, 200 * RESFACTOR, 0, &MetalScheme, TBLACK, TPF_METAL12|TPF_CENTER|TPF_USE_GRAD_PAL, hours, mins, secs);
} else {
Fancy_Text_Print(TXT_TIME_FORMAT_NO_HOURS, 200 * RESFACTOR, 0, &MetalScheme, TBLACK, TPF_METAL12|TPF_CENTER|TPF_USE_GRAD_PAL, mins, secs);
}
#else
if (hours) {
Fancy_Text_Print("%02d:%02d:%02d", 120 * RESFACTOR, 0, &ColorRemaps[PCOLOR_GREY], TBLACK, TPF_NOSHADOW|TPF_6PT_GRAD|TPF_CENTER|TPF_BRIGHT_COLOR, hours, mins, secs);
} else {
Fancy_Text_Print("%02d:%02d", 120 * RESFACTOR, 0, &ColorRemaps[PCOLOR_GREY], TBLACK, TPF_NOSHADOW|TPF_6PT_GRAD|TPF_CENTER|TPF_BRIGHT_COLOR, mins, secs);
}
#endif //WIN32
}
IsToRedraw = false;
@@ -236,8 +225,6 @@ void CreditClass::AI(bool forced, HouseClass *player_ptr, bool logic_only)
adder = ABS(adder);
adder >>= 3;
// adder >>= 4;
// adder >>= 5;
adder = Bound(adder, 1, 71+72);
if (Current > Credits) adder = -adder;
Current += adder;