From 889a564e73e824f736706345c19497007a321df7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Dec 2014 22:25:37 -0500
Subject: ACCESS: Fix definition of river data structures

---
 engines/access/amazon/amazon_resources.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'engines/access/amazon/amazon_resources.h')

diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h
index e75b78a9e3..be1dc7d05b 100644
--- a/engines/access/amazon/amazon_resources.h
+++ b/engines/access/amazon/amazon_resources.h
@@ -120,14 +120,12 @@ extern const byte *MAPTBL[3];
 
 extern const int DOWNRIVEROBJ[14][4];
 
-extern RiverStruct RIVER0OBJECTS[45];
-extern RiverStruct ENDRIVER0[1];
-extern RiverStruct RIVER1OBJECTS[49];
-extern RiverStruct ENDRIVER1[1];
-extern RiverStruct RIVER2OBJECTS[53];
-extern RiverStruct ENDRIVER2[1];
-
-extern RiverStruct *RIVEROBJECTTBL[6];
+extern RiverStruct RIVER0OBJECTS[46];
+extern RiverStruct RIVER1OBJECTS[50];
+extern RiverStruct RIVER2OBJECTS[54];
+extern RiverStruct *RIVER_OBJECTS[3][2];
+enum { RIVER_START = 0, RIVER_END = 1 };
+
 extern const int HELP1COORDS[2][4];
 
 extern const int RIVER1OBJ[23][4];
-- 
cgit v1.2.3