diff options
author | Treeki <treeki@gmail.com> | 2012-07-25 19:01:07 +0200 |
---|---|---|
committer | Treeki <treeki@gmail.com> | 2012-07-25 19:01:07 +0200 |
commit | c01d2d5df5c0bca7b8714f54e8efbd3456b1182e (patch) | |
tree | 32e300afd926ba181a8a0b1c5a2199d075e0e258 /src/koopatlas/map.h | |
parent | aea689a23e1390d62896ba96667631add5c33018 (diff) | |
parent | 6895c831ad320c14b01ccabe1c8adcec354e3f9f (diff) | |
download | kamek-c01d2d5df5c0bca7b8714f54e8efbd3456b1182e.tar.gz kamek-c01d2d5df5c0bca7b8714f54e8efbd3456b1182e.zip |
Merge branch 'freeform-unlocks' into level-select
Diffstat (limited to 'src/koopatlas/map.h')
-rw-r--r-- | src/koopatlas/map.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/koopatlas/map.h b/src/koopatlas/map.h index 14c2b87..8d3e2ae 100644 --- a/src/koopatlas/map.h +++ b/src/koopatlas/map.h @@ -42,8 +42,8 @@ class dWMMap_c : public dBase_c { void beginRendering(); void endRendering(); - void renderTileLayer(dKPLayer_s *layer, dKPLayer_s::sector_s *sector, int alpha); - void renderDoodadLayer(dKPLayer_s *layer, int alpha); + void renderTileLayer(dKPLayer_s *layer, dKPLayer_s::sector_s *sector); + void renderDoodadLayer(dKPLayer_s *layer); void loadTexture(GXTexObj *obj); @@ -55,7 +55,6 @@ class dWMMap_c : public dBase_c { float baseZ; int minX, minY, maxX, maxY; - int unlockingAlpha; }; renderer_c renderer; |