diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-07-28 23:13:49 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | 71fa444424be52b9b2c3fd508ad663923d28a62c (patch) | |
| tree | ea900efcb439d1889255e0c598dbf455608f36a4 /src/win95/wpchunk.cpp | |
| parent | f759e35cd8399d8bffea4d59c5822db8f1002409 (diff) | |
Removed headers that were accidently checked in.
Lots of compiling.
Diffstat (limited to 'src/win95/wpchunk.cpp')
| -rw-r--r-- | src/win95/wpchunk.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/win95/wpchunk.cpp b/src/win95/wpchunk.cpp index c26a5a6..bc20a4f 100644 --- a/src/win95/wpchunk.cpp +++ b/src/win95/wpchunk.cpp @@ -116,6 +116,8 @@ Module_Waypoint_Chunk::Module_Waypoint_Chunk(Chunk_With_Children* parent,const c int first_ground_waypoint=-1; for(int i=0;i<NumWaypoints;i++) { + int j; + ChunkWaypoint* cw=&Waypoints[i]; cw->index=i; @@ -139,7 +141,7 @@ Module_Waypoint_Chunk::Module_Waypoint_Chunk(Chunk_With_Children* parent,const c else cw->WayLinks=0; - for(int j=0;j<cw->NumWPLinks;j++) + for(j=0;j<cw->NumWPLinks;j++) { cw->WayLinks[j]=*(WaypointLink*)data; data+=sizeof(WaypointLink); @@ -244,6 +246,8 @@ void Module_Waypoint_Chunk::fill_data_block(char* data_start) for(int i=0;i<NumWaypoints;i++) { + int j; + ChunkWaypoint* cw=&Waypoints[i]; *(ChunkVectorInt*)data_start=cw->min; @@ -270,7 +274,7 @@ void Module_Waypoint_Chunk::fill_data_block(char* data_start) *(int*)data_start=cw->NumWPLinks; data_start+=4; - for(int j=0;j<cw->NumWPLinks;j++) + for(j=0;j<cw->NumWPLinks;j++) { *(WaypointLink*)data_start=cw->WayLinks[j]; data_start+=sizeof(WaypointLink); @@ -299,9 +303,11 @@ void Module_Waypoint_Chunk::TransferWaypointData(Module_Waypoint_Chunk* mwc_from if(mwc_from->NumWaypoints) { + int i; + ChunkWaypoint* new_wp=new ChunkWaypoint[NumWaypoints+mwc_from->NumWaypoints]; //first take alien waypoints from this chunk - for(int i=0;i<NumAlienWaypoints;i++) + for(i=0;i<NumAlienWaypoints;i++) { new_wp[i]=AlienWaypoints[i]; //set pointers to zero so the memory doesn't get deallocated when the old |