summaryrefslogtreecommitdiff
path: root/src/koopatlas/starcoin.cpp
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-09-27 16:58:43 +0200
committerTreeki <treeki@gmail.com>2012-09-27 16:58:43 +0200
commit624a89dc12d88973486b39937871c5facf6b9bb6 (patch)
treeff7614e780d13162d1749e4f57478dc16b9226d7 /src/koopatlas/starcoin.cpp
parent3268b1fab87a34897289faa8a1f5ee0679f74e19 (diff)
parent0fc70778c02671e64b8360b7ebdbb0e8c29f0a05 (diff)
downloadkamek-624a89dc12d88973486b39937871c5facf6b9bb6.tar.gz
kamek-624a89dc12d88973486b39937871c5facf6b9bb6.zip
Merge branch 'new-hud' into level-select
Diffstat (limited to '')
-rw-r--r--src/koopatlas/starcoin.cpp26
1 files changed, 3 insertions, 23 deletions
diff --git a/src/koopatlas/starcoin.cpp b/src/koopatlas/starcoin.cpp
index 54b7218..3842f87 100644
--- a/src/koopatlas/starcoin.cpp
+++ b/src/koopatlas/starcoin.cpp
@@ -1,26 +1,6 @@
#include "koopatlas/starcoin.h"
#include <game.h>
-int getStarCoinCountCoins() {
- SaveBlock *save = GetSaveFile()->GetBlock(-1);
- int coinsSpent = save->credits_hiscore;
- int coinsEarned = 0;
-
- for (int w = 0; w < 10; w++) {
- for (int l = 0; l < 10; l++) {
- u32 conds = save->GetLevelCondition(w, l);
-
- if (conds & COND_COIN1) { coinsEarned++; }
- if (conds & COND_COIN2) { coinsEarned++; }
- if (conds & COND_COIN3) { coinsEarned++; }
- }
- }
-
- int coinsLeft = coinsEarned - coinsSpent;
- return coinsLeft;
-}
-
-
/*****************************************************************************/
// Starcoin Layout
//
@@ -227,7 +207,7 @@ void dWMStarCoin::LoadCoinsForWorld(int world) {
// Display Total Star Coin Count
- int myCoins = getStarCoinCountCoins();
+ int myCoins = getStarCoinCount();
char myCoinsStr [4];
sprintf(myCoinsStr, "%03d", myCoins);
@@ -346,10 +326,10 @@ void dWMStarCoin::setText(const char *str, const char *name) {
nw4r::ut::TextWriter tw;
tw.font = box->font;
tw.SetFontSize(box->fontSizeX, box->fontSizeY);
- tw.somethingRelatedToLineHeight = box->lineSpace;
+ tw.lineSpace = box->lineSpace;
tw.charSpace = box->charSpace;
if (box->tagProc != 0)
- tw.tagProcessorMaybe = box->tagProc;
+ tw.tagProcessor = box->tagProc;
float width = tw.CalcStringWidth(newString, wlength);
SpammyReport("Text width: %f\n", width);