Update of /cvsroot/playerstage/code/player/server/drivers/map
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17879/drivers/map
Modified Files:
Tag: release-2-0-patches
Makefile.am mapcspace.cc maptransform.h
Log Message:
fixed bug in mapcspace semantics, and in MAP_VALID macro
Index: mapcspace.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/map/mapcspace.cc,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -d -r1.11.2.2 -r1.11.2.3
*** mapcspace.cc 7 Jun 2006 16:12:49 -0000 1.11.2.2
--- mapcspace.cc 23 Jan 2007 02:07:31 -0000 1.11.2.3
***************
*** 192,196 ****
// grow both occupied and unknown regions
! if(state <= 0)
{
for(dj = -r; dj <= r; dj++)
--- 192,196 ----
// grow both occupied and unknown regions
! if(state >= 0)
{
for(dj = -r; dj <= r; dj++)
***************
*** 207,211 ****
// don't change occupied to uknown
! if(this->new_data[MAP_IDX(new_map,i+di,j+dj)] > state)
{
this->new_data[MAP_IDX(new_map,i+di,j+dj)] = state;
--- 207,211 ----
// don't change occupied to uknown
! if(this->new_data[MAP_IDX(new_map,i+di,j+dj)] < state)
{
this->new_data[MAP_IDX(new_map,i+di,j+dj)] = state;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/map/Makefile.am,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -C2 -d -r1.9.4.2 -r1.9.4.3
*** Makefile.am 7 Jun 2006 19:03:50 -0000 1.9.4.2
--- Makefile.am 23 Jan 2007 02:07:31 -0000 1.9.4.3
***************
*** 1,3 ****
! AM_CPPFLAGS = -Wall -I$(top_srcdir) @GDK_PIXBUF_CFLAGS@
noinst_LTLIBRARIES =
--- 1,3 ----
! AM_CPPFLAGS = -g -Wall -I$(top_srcdir) @GDK_PIXBUF_CFLAGS@
noinst_LTLIBRARIES =
Index: maptransform.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/map/maptransform.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** maptransform.h 19 Apr 2006 21:29:28 -0000 1.1.2.2
--- maptransform.h 23 Jan 2007 02:07:31 -0000 1.1.2.3
***************
*** 41,45 ****
// check that given coords are valid (i.e., on the map)
! #define MAP_VALID(mf, i, j) ((i >= 0) && (i < mf.width) && (j >= 0) && (j <
mf.width))
class MapTransform : public Driver
--- 41,45 ----
// check that given coords are valid (i.e., on the map)
! #define MAP_VALID(mf, i, j) ((i >= 0) && (i < mf.width) && (j >= 0) && (j <
mf.height))
class MapTransform : public Driver
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
