Mercurial > mm7
comparison Level/Decoration.cpp @ 1554:e303d8a9bcdc
Merge
author | Grumpy7 |
---|---|
date | Sat, 07 Sep 2013 21:14:48 +0200 |
parents | c4ab816fcc5e |
children | 628a0ad87136 |
comparison
equal
deleted
inserted
replaced
1553:b98812ead5d9 | 1554:e303d8a9bcdc |
---|---|
1 #include "Decoration.h" | 1 #include "Decoration.h" |
2 #include "../Party.h" | 2 #include "../Party.h" |
3 #include "../ErrorHandling.h" | |
3 | 4 |
4 //----- (004583B0) -------------------------------------------------------- | 5 //----- (004583B0) -------------------------------------------------------- |
5 LevelDecoration::LevelDecoration() | 6 LevelDecoration::LevelDecoration() |
6 { | 7 { |
7 memset(this, 0, sizeof(this)); | 8 memset(this, 0, sizeof(this)); |
104 | 105 |
105 case 222: case 223: case 224: | 106 case 222: case 223: case 224: |
106 case 225: case 226: case 227: | 107 case 225: case 226: case 227: |
107 return 0; | 108 return 0; |
108 | 109 |
109 default: assert(false && "Invalid Decoration"); | 110 default: Error("Invalid DecorationDescID: %u", uDecorationDescID); |
110 } | 111 } |
111 } | 112 } |
112 | 113 |
113 //----- (0047A825) -------------------------------------------------------- | 114 //----- (0047A825) -------------------------------------------------------- |
114 bool LevelDecoration::IsObeliskChestActive() | 115 bool LevelDecoration::IsObeliskChestActive() |