From 5615c2a075d4ea507d6ea3d4b792fc1f55c90a10 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 29 Nov 2006 23:49:44 +0000
Subject: [PATCH] - bugfix: Wrong text placement in the florist gallery website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                    | Bin 197632 -> 197632 bytes
 Laptop/florist Gallery.cpp |   8 ++++----
 builddefines.h             |   4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 7c4ff632d9b8fe49fec10db9a67b17ee2b814cbc..355a3236d3f0daadac8ecb08fdb51cb268d78c99 100644
GIT binary patch
delta 3125
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

delta 2511
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

diff --git a/Laptop/florist Gallery.cpp b/Laptop/florist Gallery.cpp
index c06b12323..928637115 100644
--- a/Laptop/florist Gallery.cpp	
+++ b/Laptop/florist Gallery.cpp	
@@ -34,20 +34,20 @@
 #define	FLOR_GALLERY_FLOWER_DESC_TEXT_FONT		FONT12ARIAL
 #define	FLOR_GALLERY_FLOWER_DESC_TEXT_COLOR		FONT_MCOLOR_WHITE
 
-#define FLOR_GALLERY_BACK_BUTTON_X						LAPTOP_SCREEN_UL_X + 8
+#define FLOR_GALLERY_BACK_BUTTON_X						(LAPTOP_SCREEN_UL_X + 8)
 #define FLOR_GALLERY_BACK_BUTTON_Y						LAPTOP_SCREEN_WEB_UL_Y + 12
 
 #define FLOR_GALLERY_NEXT_BUTTON_X						LAPTOP_SCREEN_UL_X + 420
 #define FLOR_GALLERY_NEXT_BUTTON_Y						FLOR_GALLERY_BACK_BUTTON_Y
 	
-#define FLOR_GALLERY_FLOWER_BUTTON_X					LAPTOP_SCREEN_UL_X + 7
+#define FLOR_GALLERY_FLOWER_BUTTON_X					(LAPTOP_SCREEN_UL_X + 7)
 #define FLOR_GALLERY_FLOWER_BUTTON_Y					LAPTOP_SCREEN_WEB_UL_Y + 74
 
 #define FLOR_GALLERY_FLOWER_BUTTON_OFFSET_Y		112
 
-#define FLOR_GALLERY_TITLE_TEXT_X							LAPTOP_SCREEN_UL_X + 0
+#define FLOR_GALLERY_TITLE_TEXT_X							(LAPTOP_SCREEN_UL_X + 0)
 #define FLOR_GALLERY_TITLE_TEXT_Y							LAPTOP_SCREEN_WEB_UL_Y + 48
-#define FLOR_GALLERY_TITLE_TEXT_WIDTH						613 - 611 
+#define FLOR_GALLERY_TITLE_TEXT_WIDTH						(613 - 111)	
 
 #define FLOR_GALLERY_FLOWER_TITLE_X						FLOR_GALLERY_FLOWER_BUTTON_X + 88
 
diff --git a/builddefines.h b/builddefines.h
index f11a2e8f5..142d3b347 100644
--- a/builddefines.h
+++ b/builddefines.h
@@ -15,14 +15,14 @@
 // Debug version of the editor!
 //#define JA2EDITOR
 
-/*
+
 // Editor
 #ifdef _DEBUG
 	#ifndef JA2TESTVERSION
 		#define JA2TESTVERSION
 	#endif
 #endif
-*/
+
 
 // Do combinations
 #ifdef JA2TESTVERSION