diff options
| author | Strangerke | 2013-01-27 23:30:40 +0100 |
|---|---|---|
| committer | Strangerke | 2013-01-27 23:30:40 +0100 |
| commit | e923cdef5b31fbdd85894aa37c186c1e8574ffb9 (patch) | |
| tree | 585c365241276746d2be2ca7863732acf7726e53 /engines/hopkins/lines.h | |
| parent | e77198081d35ffe0e468eb983010750b8103dc0d (diff) | |
| download | scummvm-rg350-e923cdef5b31fbdd85894aa37c186c1e8574ffb9.tar.gz scummvm-rg350-e923cdef5b31fbdd85894aa37c186c1e8574ffb9.tar.bz2 scummvm-rg350-e923cdef5b31fbdd85894aa37c186c1e8574ffb9.zip | |
HOPKINS: Some refactoring in LinesManager
Diffstat (limited to 'engines/hopkins/lines.h')
| -rw-r--r-- | engines/hopkins/lines.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/engines/hopkins/lines.h b/engines/hopkins/lines.h index 2208ced2a1..69d59f530f 100644 --- a/engines/hopkins/lines.h +++ b/engines/hopkins/lines.h @@ -51,12 +51,11 @@ struct SmoothItem { }; struct SegmentItem { - int field0; // Useless variable - int field2; - int field4; + int _minZoneLineIdx; + int _maxZoneLineIdx; }; -struct CarreZoneItem { +struct SquareZoneItem { int _enabledFl; int _left; int _right; @@ -86,8 +85,8 @@ private: int16 *BufLig; LigneZoneItem _zoneLine[401]; LigneItem Ligne[400]; - SegmentItem Segment[101]; - CarreZoneItem CarreZone[101]; + SegmentItem _segment[101]; + SquareZoneItem _squareZone[101]; int _currentSegmentId; int _maxLineIdx; int _lastLine; @@ -107,12 +106,11 @@ private: bool makeSmoothMove(int fromX, int fromY, int destX, int destY); bool PLAN_TEST(int paramX, int paramY, int a3, int a4, int a5); int TEST_LIGNE(int paramX, int paramY, int *a3, int *foundLineIdx, int *foundDataIdx); - -public: - int16 *essai2; + int colision(int xp, int yp); public: int16 *_route; + int16 *essai2; LinesManager(); ~LinesManager(); @@ -128,7 +126,6 @@ public: void resetLines(); void addLine(int idx, int a2, int a3, int a4, int a5, int a6, int a7); void initRoute(); - int colision(int xp, int yp); int MZONE(); void CARRE_ZONE(); void clearAll(); |