aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-07 04:01:56 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-07 04:01:56 +0000
commit3c7ced2cf99a2874e4d761e6859dbc285bbed5ac (patch)
tree31d746e387f509c6fd83c4a1a0eea70c1fb783c0
parent34743b2b02f912f92a9a17b310979aab95293532 (diff)
downloadbullet-lab-remix-3c7ced2cf99a2874e4d761e6859dbc285bbed5ac.tar.xz
Fix compile errors in Windows and another memory leak, which won't be found under Linux. Done testing Windows version.
-rwxr-xr-xCHANGELOG.TXT6
-rw-r--r--background.h5
-rw-r--r--levels.h2
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 49b2883..91f01d5 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -2,7 +2,9 @@
Next version:
0.7.3-0_PR
TODOs:
-Problems with TDSky and PicBack in Windows.
+Avoid object sucide, this may cause segmentation fault in Windows.
+(My doubly link list is written in a bad style.)
+Others TODOs:
Add MultPo's.
Test classic mode, difficulty adjustments. Merge code for Windows.
P.S.: Level 1 may be too hard now.
@@ -19,6 +21,8 @@ Implement a RandomEngine, replacing all rand().
Fixed: Trypophobia stops if too many CLR's are used.
Fixed the problem in All2pnt().
Fixed blinking target.
+Fixed Hexagon loops memory leak (the pointer array is too small...)
+Tests under Windows were done, all gameplay features ran perfectly.
Make Laser::GetDist() private to avoid misusage.
Fixed several background problems.
Remove unused statements:
diff --git a/background.h b/background.h
index 2f6a56f..9cc6a37 100644
--- a/background.h
+++ b/background.h
@@ -437,9 +437,8 @@ public:
void Render()
{
#ifdef WIN32
- skygrad->SetTexture(0);
- skygrad->SetTextureRect(0,0,800,600);
- skygrad->SetBlendMode(BLEND_DEFAULT);
+ skygrad.tex=0;
+ skygrad.blend=BLEND_DEFAULT;
#endif
skygrad.v[0].col=skygrad.v[1].col=colSkyTop.GetHWColor();
skygrad.v[2].col=skygrad.v[3].col=colSkyBtm.GetHWColor();
diff --git a/levels.h b/levels.h
index 415fb29..9e249be 100644
--- a/levels.h
+++ b/levels.h
@@ -1782,7 +1782,7 @@ void Level6Part17()
}
}
//begin hexagon
-Bullet bheader[100],*beewx[500];
+Bullet bheader[100],*beewx[800];
static int sxcnt,seq,beecnt;
bool brdir;
double offset;