1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
# Copyright (C) 2008, by Miriam Ruiz <little_miry@yahoo.es>
# Distributed under the same license as the game. See debian/copyright.
Index: holotz-castle-1.3.10/JLib/JLib/Graphics/JFont.h
===================================================================
--- holotz-castle-1.3.10.orig/JLib/JLib/Graphics/JFont.h 2008-04-08 10:34:56.000000000 +0000
+++ holotz-castle-1.3.10/JLib/JLib/Graphics/JFont.h 2008-04-08 10:34:59.000000000 +0000
@@ -36,7 +36,7 @@
/** Alineacin del texto a renderizar.
*/
-typedef enum JFontAlign
+enum JFontAlign
{
JFONTALIGN_LEFT = 0, /**< Alineado a la izquierda. */
JFONTALIGN_RIGHT, /**< Alineado a la derecha. */
@@ -50,7 +50,7 @@
{
/** Tipo de renderizado a usar
*/
- typedef enum JFontRenderType
+ enum JFontRenderType
{
JFONTRENDERTYPE_SOLID = 0, /**< Slido con colorkey. */
JFONTRENDERTYPE_SHADED, /**< Con antialiasing en fondo slido. */
Index: holotz-castle-1.3.10/src/HCText.h
===================================================================
--- holotz-castle-1.3.10.orig/src/HCText.h 2008-04-08 10:34:56.000000000 +0000
+++ holotz-castle-1.3.10/src/HCText.h 2008-04-08 10:34:59.000000000 +0000
@@ -35,7 +35,7 @@
#include <JLib/Graphics/JFont.h>
#include <HCTheme.h>
-typedef enum HCTextType
+enum HCTextType
{
HCTEXTTYPE_DIALOG, /**< Dialog balloon. */
HCTEXTTYPE_NARRATIVE, /**< Narrative frame. */
Index: holotz-castle-1.3.10/src/HCCharacter.cpp
===================================================================
--- holotz-castle-1.3.10.orig/src/HCCharacter.cpp 2008-04-08 10:34:59.000000000 +0000
+++ holotz-castle-1.3.10/src/HCCharacter.cpp 2008-04-08 10:34:59.000000000 +0000
@@ -739,12 +739,12 @@
if (actions & HCCA_UP && state != HCCS_HANG)
{
// Up requested
- if (map->Cell(row, col)->Actions() & HCACTION_UP != 0)
+ if ((map->Cell(row, col)->Actions() & HCACTION_UP) != 0)
{
State(HCCS_UP);
// Can go up in the current cell
- if (map->Cell(row - 1, col)->Actions() & HCACTION_UP ||
- map->Cell(row - 1, col)->Actions() & HCACTION_FALL)
+ if ((map->Cell(row - 1, col)->Actions() & HCACTION_UP) ||
+ (map->Cell(row - 1, col)->Actions() & HCACTION_FALL))
{
// Can go up in the upper cell or cell above empty, continue
a.y = -map->Gravity() - aMax.y;
Index: holotz-castle-1.3.10/src/HCEnemyChaser.cpp
===================================================================
--- holotz-castle-1.3.10.orig/src/HCEnemyChaser.cpp 2008-04-08 10:35:23.000000000 +0000
+++ holotz-castle-1.3.10/src/HCEnemyChaser.cpp 2008-04-08 10:36:11.000000000 +0000
@@ -561,7 +561,7 @@
chased->State() == HCCS_HANG ||
(abs(curRow - r) + abs(curCol - c) <= searchDepth && 0 == GoTo(r, c)))
{
- if (chasePath[chaseIndex].col != curCol || chasePath[chaseIndex].row != curRow && chaseIndex < searchDepth - 1)
+ if ((chasePath[chaseIndex].col != curCol || chasePath[chaseIndex].row != curRow) && chaseIndex < searchDepth - 1)
{
// Updates the chase index within the path when the row or column changes
++chaseIndex;
|
