Update of /cvsroot/playerstage/code/player/server/drivers/map
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11860/server/drivers/map
Modified Files:
Tag: b_thjc_dynamic_arrays
maptransform.cc .cvsignore
Log Message:
dynamic array changes to drivers compile, still needs testing
added lots more .cvsignore settings for eclipse
Index: .cvsignore
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/map/.cvsignore,v
retrieving revision 1.1.16.1
retrieving revision 1.1.16.2
diff -C2 -d -r1.1.16.1 -r1.1.16.2
*** .cvsignore 10 Oct 2007 09:26:13 -0000 1.1.16.1
--- .cvsignore 19 Oct 2007 21:58:57 -0000 1.1.16.2
***************
*** 4,5 ****
--- 4,7 ----
*.la
*.a
+ .libs
+ *.lo
Index: maptransform.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/map/maptransform.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** maptransform.cc 14 Oct 2007 04:41:47 -0000 1.2.2.1
--- maptransform.cc 19 Oct 2007 21:58:57 -0000 1.2.2.2
***************
*** 121,131 ****
unsigned int si,sj;
! reqlen = sizeof(player_map_data_t) - PLAYER_MAP_MAX_TILE_SIZE + 4;
! data_req = (player_map_data_t*)calloc(1, reqlen);
assert(data_req);
! // Tile size
! sy = sx = (int)sqrt(PLAYER_MAP_MAX_TILE_SIZE);
! assert(sx * sy < (int)PLAYER_MAP_MAX_TILE_SIZE);
oi=oj=0;
while((oi < this->source_map.width) && (oj < this->source_map.height))
--- 121,129 ----
unsigned int si,sj;
! data_req = (player_map_data_t*)malloc(sizeof(player_map_data_t));
assert(data_req);
! // Tile size, limit to sensible default of about 640x640
! sy = sx = 640;
oi=oj=0;
while((oi < this->source_map.width) && (oj < this->source_map.height))
***************
*** 218,222 ****
player_map_data_t & map_data = *reinterpret_cast<player_map_data_t *>
(data);
player_map_data_t resp_data;
! memcpy(&resp_data, map_data, sizeof(map_data));
unsigned int i, j;
--- 216,220 ----
player_map_data_t & map_data = *reinterpret_cast<player_map_data_t *>
(data);
player_map_data_t resp_data;
! memcpy(&resp_data, &map_data, sizeof(map_data));
unsigned int i, j;
***************
*** 230,234 ****
PLAYER_MSG4(9,"Block Requested is: %d,%d + %d,%d",oi,oj,si,sj);
resp_data.data_count = map_data.width * map_data.height;
! resp_data.data = new int8_t * [resp_data.data_count];
// Grab the pixels from the map
--- 228,232 ----
PLAYER_MSG4(9,"Block Requested is: %d,%d + %d,%d",oi,oj,si,sj);
resp_data.data_count = map_data.width * map_data.height;
! resp_data.data = new int8_t [resp_data.data_count];
// Grab the pixels from the map
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
