git » fp-git.git » commit 10abdfe

diff --git a/FP/src/include/anims.h b/FP/src/include/anims.h
index ea37851..3446481 100644
--- a/FP/src/include/anims.h
+++ b/FP/src/include/anims.h
@@ -30,8 +30,8 @@ anims.h: FreePrince : Animation functions
   DO NOT remove this copyright notice
 */
 
-#ifndef _ANIMS_H_
-#define _ANIMS_H_
+#ifndef _PR_ANIMS_H_
+#define _PR_ANIMS_H_
 
 #include "res_conf.h"    /* RES_FILE_*    */
 #include "states_conf.h" /* STATES_MARK_* */
diff --git a/FP/src/include/common.h b/FP/src/include/common.h
index 3dccef6..27eb975 100644
--- a/FP/src/include/common.h
+++ b/FP/src/include/common.h
@@ -29,8 +29,8 @@ common.h: Princed Resources : Resource Handler headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef _PR_COMMON_H_
+#define _PR_COMMON_H_
 
 #define DEBUG_POS
 
diff --git a/FP/src/include/compress.h b/FP/src/include/compress.h
index 784830d..35a9498 100644
--- a/FP/src/include/compress.h
+++ b/FP/src/include/compress.h
@@ -31,8 +31,8 @@ compress.c: Princed Resources : Image Compressor headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _COMPRESS_H_
-#define _COMPRESS_H_
+#ifndef _PR_COMPRESS_H_
+#define _PR_COMPRESS_H_
 
 #define SIZE_OF_PALETTE 3*16
 
diff --git a/FP/src/include/dat.h b/FP/src/include/dat.h
index 3f6b145..31845b5 100644
--- a/FP/src/include/dat.h
+++ b/FP/src/include/dat.h
@@ -31,8 +31,8 @@ dat.h: Princed Resources : DAT library headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _DAT_H_
-#define _DAT_H_
+#ifndef _PR_DAT_H_
+#define _PR_DAT_H_
 
 #include "resources.h"
 
diff --git a/FP/src/include/disk.h b/FP/src/include/disk.h
index 59204c2..0d43345 100644
--- a/FP/src/include/disk.h
+++ b/FP/src/include/disk.h
@@ -36,8 +36,8 @@ disk.h: Princed Resources : Disk Access & File handling functions headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _DISK_H_
-#define _DISK_H_
+#ifndef _PR_DISK_H_
+#define _PR_DISK_H_
 
 #include <stdio.h>
 
diff --git a/FP/src/include/input.h b/FP/src/include/input.h
index bb16b64..c8fb276 100644
--- a/FP/src/include/input.h
+++ b/FP/src/include/input.h
@@ -30,8 +30,8 @@ input.h: Free Prince : Input devices handling
   DO NOT remove this copyright notice
 */
 
-#ifndef _INPUT_H_
-#define _INPUT_H_
+#ifndef _PR_INPUT_H_
+#define _PR_INPUT_H_
 
 #include "common.h"
 
diff --git a/FP/src/include/kernel.h b/FP/src/include/kernel.h
index 956276b..e1d9705 100644
--- a/FP/src/include/kernel.h
+++ b/FP/src/include/kernel.h
@@ -31,8 +31,8 @@ kernel.h: Princed Resources : Resource Handler headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _KERNEL_H_
-#define _KERNEL_H_
+#ifndef _PR_KERNEL_H_
+#define _PR_KERNEL_H_
 
 /* Flags */
 #define megahit_flag     0x0001
diff --git a/FP/src/include/keylog.h b/FP/src/include/keylog.h
index e537e1f..94d3c25 100644
--- a/FP/src/include/keylog.h
+++ b/FP/src/include/keylog.h
@@ -30,8 +30,8 @@ input.h: Free Prince : Input devices handling
   DO NOT remove this copyright notice
 */
 
-#ifndef _KEYLOG_H_
-#define _KEYLOG_H_
+#ifndef _PR_KEYLOG_H_
+#define _PR_KEYLOG_H_
 
 #include "input.h"
 
diff --git a/FP/src/include/kid.h b/FP/src/include/kid.h
index 12d6a66..25d6039 100644
--- a/FP/src/include/kid.h
+++ b/FP/src/include/kid.h
@@ -30,8 +30,8 @@ kid.h: Free Prince : Kid object
   DO NOT remove this copyright notice
 */
 
-#ifndef _KID_H_
-#define _KID_H_
+#ifndef _PR_KID_H_
+#define _PR_KID_H_
 
 #include "resources.h"
 #include "room.h"
diff --git a/FP/src/include/main.h b/FP/src/include/main.h
index 2d39283..d2849ad 100644
--- a/FP/src/include/main.h
+++ b/FP/src/include/main.h
@@ -30,8 +30,8 @@ main.h: Princed Resources : Main function and parser headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _MAIN_H_
-#define _MAIN_H_
+#ifndef _PR_MAIN_H_
+#define _PR_MAIN_H_
 
 /***************************************************************\
 |                   Command Line specific options               |
diff --git a/FP/src/include/maps.h b/FP/src/include/maps.h
index f77fedb..6b514e4 100644
--- a/FP/src/include/maps.h
+++ b/FP/src/include/maps.h
@@ -30,8 +30,8 @@ maps.c: Freeprince : Map handling library
   DO NOT remove this copyright notice
 */
 
-#ifndef _MAPS_H_
-#define _MAPS_H_
+#ifndef _PR_MAPS_H_
+#define _PR_MAPS_H_
 
 #include "map_defs.h"
 #include "room.h"
diff --git a/FP/src/include/memory.h b/FP/src/include/memory.h
index 2211865..5e4d3f1 100644
--- a/FP/src/include/memory.h
+++ b/FP/src/include/memory.h
@@ -31,8 +31,8 @@ memory.h: Princed Resources : Memory handling headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _MEMORY_H_
-#define _MEMORY_H_
+#ifndef _PR_MEMORY_H_
+#define _PR_MEMORY_H_
 
 /* #define MEM_CHECK */
 
diff --git a/FP/src/include/object.h b/FP/src/include/object.h
index 581e0ba..ab6634c 100644
--- a/FP/src/include/object.h
+++ b/FP/src/include/object.h
@@ -30,8 +30,8 @@ kid.h: Free Prince : Generic objects
   DO NOT remove this copyright notice
 */
 
-#ifndef _OBJECT_H_
-#define _OBJECT_H_
+#ifndef _PR_OBJECT_H_
+#define _PR_OBJECT_H_
 
 #include "resources.h"
 #include "input.h"
diff --git a/FP/src/include/output.h b/FP/src/include/output.h
index 5d5f43c..eaedb89 100644
--- a/FP/src/include/output.h
+++ b/FP/src/include/output.h
@@ -35,8 +35,8 @@ output.h: Free Prince : Output Devices Handler
   DO NOT remove this copyright notice
 */
 
-#ifndef _OUTPUT_H_
-#define _OUTPUT_H_
+#ifndef _PR_OUTPUT_H_
+#define _PR_OUTPUT_H_
 
 #include "resources.h"
 
diff --git a/FP/src/include/res_conf.h b/FP/src/include/res_conf.h
index 556e705..7c9d73b 100644
--- a/FP/src/include/res_conf.h
+++ b/FP/src/include/res_conf.h
@@ -4,8 +4,8 @@
  */
 
 
-#ifndef _RES_CONF_H_
-#define _RES_CONF_H_
+#ifndef _RES_PR_CONF_H_
+#define _RES_PR_CONF_H_
 
 /* parts */
 #include "res_conf_parts.h"
diff --git a/FP/src/include/resources.h b/FP/src/include/resources.h
index 02425a2..2509452 100644
--- a/FP/src/include/resources.h
+++ b/FP/src/include/resources.h
@@ -30,8 +30,8 @@ resources.h: Free Prince : Resource Handler
   DO NOT remove this copyright notice
 */
 
-#ifndef _RESOURCES_H_
-#define _RESOURCES_H_
+#ifndef _PR_RESOURCES_H_
+#define _PR_RESOURCES_H_
 
 #include "config.h"
 
diff --git a/FP/src/include/room.h b/FP/src/include/room.h
index acf1117..76e6967 100644
--- a/FP/src/include/room.h
+++ b/FP/src/include/room.h
@@ -31,8 +31,8 @@ room.h: FreePrince : Draw Screen
   DO NOT remove this copyright notice
 */
 
-#ifndef _ROOM_H_
-#define _ROOM_H_
+#ifndef _PR_ROOM_H_
+#define _PR_ROOM_H_
 
 #define TILE_W 32
 #define TILE_H 62
diff --git a/FP/src/include/states.h b/FP/src/include/states.h
index 05ebb53..30a808c 100644
--- a/FP/src/include/states.h
+++ b/FP/src/include/states.h
@@ -1,5 +1,5 @@
-#ifndef _STATES_H_
-#define _STATES_H_
+#ifndef _PR_STATES_H_
+#define _PR_STATES_H_
 
 /* Structs */
 
diff --git a/FP/src/include/states_conf.h b/FP/src/include/states_conf.h
index 3b4c14b..18817cb 100644
--- a/FP/src/include/states_conf.h
+++ b/FP/src/include/states_conf.h
@@ -4,8 +4,8 @@
  */
 
 
-#ifndef _STATES_CONF_H_
-#define _STATES_CONF_H_
+#ifndef _STATES_PR_CONF_H_
+#define _STATES_PR_CONF_H_
 
 /* animation frame flag options */
 #include "states_conf_flags.h"
diff --git a/FP/src/include/tiles.h b/FP/src/include/tiles.h
index df73502..e9b8e26 100644
--- a/FP/src/include/tiles.h
+++ b/FP/src/include/tiles.h
@@ -30,8 +30,8 @@ tiles.h: FreePrince : Tile functions
   DO NOT remove this copyright notice
 */
 
-#ifndef _TILES_H_
-#define _TILES_H_
+#ifndef _PR_TILES_H_
+#define _PR_TILES_H_
 
 #include "types.h"
 #include "tiles_conf.h"
diff --git a/FP/src/include/tiles_conf.h b/FP/src/include/tiles_conf.h
index 53b9a58..d9e781a 100644
--- a/FP/src/include/tiles_conf.h
+++ b/FP/src/include/tiles_conf.h
@@ -4,8 +4,8 @@
  */
 
 
-#ifndef _TILES_CONF_H_
-#define _TILES_CONF_H_
+#ifndef _TILES_PR_CONF_H_
+#define _TILES_PR_CONF_H_
 
 /* tile types */
 #include "tiles_conf_types.h"
diff --git a/FP/src/include/titles.h b/FP/src/include/titles.h
index 7403759..93312de 100644
--- a/FP/src/include/titles.h
+++ b/FP/src/include/titles.h
@@ -31,8 +31,8 @@ titles.h: FreePrince : Titles, animation and presentation
   DO NOT remove this copyright notice
 */
 
-#ifndef _TITLES_H_
-#define _TITLES_H_
+#ifndef _PR_TITLES_H_
+#define _PR_TITLES_H_
 
 typedef enum {menuQuit=0,menuLoad=1,menuStart,menuNone}tMenuOption;
 
diff --git a/FP/src/include/types.h b/FP/src/include/types.h
index b5ca835..64d90c8 100644
--- a/FP/src/include/types.h
+++ b/FP/src/include/types.h
@@ -25,13 +25,14 @@ types.h: FreePrince : Kernel types
   Created: 23 Aug 2004
 
   Author:  Enrique Calot <ecalot.cod@princed.com.ar>
+  Dev Cpp port: H\xe9lder Maur\xedcio Gomes Ferreira Filho
 
  Note:
   DO NOT remove this copyright notice
 */
 
-#ifndef _TYPES_H_
-#define _TYPES_H_
+#ifndef _PR_TYPES_H_
+#define _PR_TYPES_H_
 
 #include "resources.h"
 
diff --git a/FP/src/include/walls.h b/FP/src/include/walls.h
index 217bf9c..9c1cc6a 100644
--- a/FP/src/include/walls.h
+++ b/FP/src/include/walls.h
@@ -30,8 +30,8 @@ walls.h: FreePrince : Walls functions
   DO NOT remove this copyright notice
 */
 
-#ifndef _WALLS_H_
-#define _WALLS_H_
+#ifndef _PR_WALLS_H_
+#define _PR_WALLS_H_
 
 #include "walls_conf.h"
author	ecalot <ecalot> 2006-04-23 18:02:49 UTC
committer	ecalot <ecalot> 2006-04-23 18:02:49 UTC
parent	a0b28d2710eeb0993e79f8a992ac0c9193720023
FP/src/include/anims.h	+2	-2
FP/src/include/common.h	+2	-2
FP/src/include/compress.h	+2	-2
FP/src/include/dat.h	+2	-2
FP/src/include/disk.h	+2	-2
FP/src/include/input.h	+2	-2
FP/src/include/kernel.h	+2	-2
FP/src/include/keylog.h	+2	-2
FP/src/include/kid.h	+2	-2
FP/src/include/main.h	+2	-2
FP/src/include/maps.h	+2	-2
FP/src/include/memory.h	+2	-2
FP/src/include/object.h	+2	-2
FP/src/include/output.h	+2	-2
FP/src/include/res_conf.h	+2	-2
FP/src/include/resources.h	+2	-2
FP/src/include/room.h	+2	-2
FP/src/include/states.h	+2	-2
FP/src/include/states_conf.h	+2	-2
FP/src/include/tiles.h	+2	-2
FP/src/include/tiles_conf.h	+2	-2
FP/src/include/titles.h	+2	-2
FP/src/include/types.h	+3	-2
FP/src/include/walls.h	+2	-2
git » fp-git.git » commit 10abdfe

changed defines to avoid problems with our friend dev cpp
