diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:53 -0600 |
| commit | 84ace1135cac57993b72fee7105b92def1638d32 (patch) | |
| tree | b8871eb76e3db4a062731b0ce7c99c24fac119e8 /kgoldrunner/src/kgrfigure.cpp | |
| parent | 97d1732e257f8700488d7ca1660ae7eba8fc6065 (diff) | |
| download | tdegames-84ace1135cac57993b72fee7105b92def1638d32.tar.gz tdegames-84ace1135cac57993b72fee7105b92def1638d32.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.
Diffstat (limited to 'kgoldrunner/src/kgrfigure.cpp')
| -rw-r--r-- | kgoldrunner/src/kgrfigure.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kgoldrunner/src/kgrfigure.cpp b/kgoldrunner/src/kgrfigure.cpp index 272c571e..7c640e88 100644 --- a/kgoldrunner/src/kgrfigure.cpp +++ b/kgoldrunner/src/kgrfigure.cpp @@ -76,7 +76,7 @@ int KGrFigure::gety() return absy; } -Status KGrFigure::getStatus() +tqStatus KGrFigure::gettqStatus() { return status; } @@ -733,7 +733,7 @@ bool KGrHero::standOnEnemy() (((absx - 16) < enemy->getx()) && ((absx + 16) > enemy->getx()))) { if (((absy + 12) == enemy->gety()) && - (enemy->getStatus() != FALLING)) { + (enemy->gettqStatus() != FALLING)) { absy = absy - rely; // Bounce back from overlap, to avoid rely = 0; // hero-enemy mid-cycle deadlock. walkCounter = 1; @@ -807,7 +807,7 @@ KGrEnemy :: KGrEnemy (KGrCanvas * view, int x, int y) walkCounter = 1; captiveCounter = 0; - searchStatus = HORIZONTAL; + searchtqStatus = HORIZONTAL; birthX=x; birthY=y; @@ -849,7 +849,7 @@ void KGrEnemy::showState(char option) case 's': printf (" nuggets %02d status %d walk-ctr %d ", nuggets, status, walkCounter); printf ("dirn %d search %d capt-ctr %d\n", - direction, searchStatus, captiveCounter); + direction, searchtqStatus, captiveCounter); printf (" rel (%02d,%02d) abs (%03d,%03d)", relx, rely, absx, absy); printf (" pix %02d", actualPixmap); @@ -907,7 +907,7 @@ void KGrEnemy::walkTimeDone () case RIGHT: walkRight (WALKDELAY, FALLDELAY); break; case LEFT: walkLeft (WALKDELAY, FALLDELAY); break; default: // Switch search direction in KGoldrunner search (only). - searchStatus = (searchStatus==VERTIKAL) ? + searchtqStatus = (searchtqStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL; // In KGoldrunner rules, if a hole opens under an enemy @@ -942,7 +942,7 @@ void KGrEnemy::walkTimeDone () // In KGoldrunner rules, change the search strategy, // to avoid enemy-enemy deadlock. - searchStatus = (searchStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL; + searchtqStatus = (searchtqStatus==VERTIKAL) ? HORIZONTAL : VERTIKAL; dirn = searchbestway (x, y, herox, heroy); if ((dirn != direction) && ((*playfield)[x][y]->whatIam() != USEDHOLE)) { @@ -1221,7 +1221,7 @@ Direction KGrEnemy::searchbestway(int ew,int eh,int hw,int hh) // KGoldrunner search strategy. case MEDIUM: case HIGH: - if(searchStatus==VERTIKAL){ + if(searchtqStatus==VERTIKAL){ if (eh > hh) return searchupway(ew,eh); if (eh < hh) |