Mercurial > mm7
comparison Outdoor.cpp @ 2064:74f06d8a8017
Merge
author | Ritor1 |
---|---|
date | Mon, 02 Dec 2013 20:43:28 +0600 |
parents | b2a434d65344 |
children | 87be06553c76 |
comparison
equal
deleted
inserted
replaced
2063:7890930801a8 | 2064:74f06d8a8017 |
---|---|
2110 Str2 = (char *)1; | 2110 Str2 = (char *)1; |
2111 } | 2111 } |
2112 } | 2112 } |
2113 } | 2113 } |
2114 | 2114 |
2115 if ( BYTE1(dword_6BE364_game_settings_1) & 0x20 ) | 2115 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_2000) |
2116 pNumItems = 29030400; | 2116 pNumItems = 0x1BAF800; |
2117 if ( Str2 ) | 2117 if ( Str2 ) |
2118 { | 2118 { |
2119 memset(Dst, 0, 0x3C8u); | 2119 memset(Dst, 0, 0x3C8u); |
2120 memset(Src, 0, 0x3C8u); | 2120 memset(Src, 0, 0x3C8u); |
2121 goto LABEL_112; | 2121 goto LABEL_112; |