[Exult-cvs-logs] exult ChangeLog,1.1767,1.1768 Makefile.common,1.14,1.15 mouse.cc,1.45,1.46 party.cc,1.19,1.20

[<col...@us...>]

Update of /cvsroot/exult/exult
In directory sc8-pr-cvs1:/tmp/cvs-serv31480

Modified Files:
	ChangeLog Makefile.common mouse.cc party.cc 
Log Message:
	* Minor changes to fix errors in MSVC
	* Updating Win32 stuff for 1.1Beta1


Index: ChangeLog
===================================================================
RCS file: /cvsroot/exult/exult/ChangeLog,v
retrieving revision 1.1767
retrieving revision 1.1768
diff -u -d -r1.1767 -r1.1768
--- ChangeLog	6 Jul 2003 08:09:17 -0000	1.1767
+++ ChangeLog	22 Jul 2003 14:26:41 -0000	1.1768
@@ -1,3 +1,7 @@
+2002-07-22  Ryan Nunn  <col...@us...>
+	* Minor changes to fix errors in MSVC
+	* Updating Win32 stuff for 1.1Beta1
+
 2003-07-06  Jeff Freedman  <je...@am...>
 
 	* actors.cc (public): Dont_move flag stops Avatar.  Also rewrote
@@ -415,13 +419,13 @@
 	* usecode/intrinsics.cc (public): Explosion should explode the
 	outermost container.
 
[...1145 lines suppressed...]
 	* Makefile.win32: Was broken, now works. Also removed -g added -O2
 	* audio/Midi.cc: Added SFX conversion option gs127 (same as none)
@@ -7098,7 +7102,7 @@
 	* data/font.shp: Menu font
 	* files/utils.h: Moved eqstr, hashstr in here so they can be shared
 
-2000-11-05  Ryan Nunn <tri...@me...>
+2000-11-05  Ryan Nunn <col...@us...>
 	* audio/Midi.*: Changes so midi drivers other than Win_midiout can play SFX.
 	* audio/xmidi.*: New midi conversion types
 	* audio/Midi.cc: Music and SFX conversion options can be set in the config file
@@ -7123,7 +7127,7 @@
 	* exult.cc: keycommands only get activated when ctrl/alt status is exactly correct
 	* exult.cc: updated help screens
 
-2000-11-04  Ryan Nunn <tri...@me...>
+2000-11-04  Ryan Nunn <col...@us...>
 	* gumps.cc, audio/Audio.cc: Sound Effects button now works and state is saved.
 	* audio/Midi.*: sfx.dat is now called midisfx.flx. It must be in the data dir.
 	Fixed bug causing midi to never be played.

Index: Makefile.common
===================================================================
RCS file: /cvsroot/exult/exult/Makefile.common,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.common	26 Jun 2003 04:27:58 -0000	1.14
+++ Makefile.common	22 Jul 2003 14:26:42 -0000	1.15
@@ -2,7 +2,7 @@
 $(SRC)/gumps:$(SRC)/imagewin:$(SRC)/objs:$(SRC)/pathfinder:$(SRC)/shapes:$(SRC)/server:$(SRC)/tools: \
 $(SRC)/usecode:$(SRC)/usecode/compiler:$(SRC)/usecode/ucxt:$(SRC)/usecode/ucxt/src
 
-VERSION=1.1.0cvs
+VERSION=1.1Beta1
 
 MAIN_OBJS=actions.o actorio.o actors.o alloc.o \
 	args.o bggame.o browser.o cheat.o  \

Index: mouse.cc
===================================================================
RCS file: /cvsroot/exult/exult/mouse.cc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- mouse.cc	24 Nov 2002 06:51:25 -0000	1.45
+++ mouse.cc	22 Jul 2003 14:26:42 -0000	1.46
@@ -35,7 +35,9 @@
 #include "combat_opts.h"
 #include "schedule.h" /* To get Schedule::combat */
 
+#ifndef _MSC_VER
 using std::max;
+#endif
 
 short Mouse::short_arrows[8] = {8, 9, 10, 11, 12, 13, 14, 15};
 short Mouse::med_arrows[8] = {16, 17, 18, 19, 20, 21, 22, 23};

Index: party.cc
===================================================================
RCS file: /cvsroot/exult/exult/party.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- party.cc	4 May 2003 06:30:01 -0000	1.19
+++ party.cc	22 Jul 2003 14:26:42 -0000	1.20
@@ -548,7 +548,7 @@
 	if (best_cost >= max_cost)
 		return false;
 	if (!best_in_way)		// Nobody in way?
-		return npc->step(best, frame);
+		return npc->step(best, frame)!=0;
 	best = best_in_way->get_tile();	// Swap positions.
 	npc->remove_this(true);
 	best_in_way->remove_this(true);