MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder dfhack-md5 GCC flags, fix another embark-assistant warning

develop
lethosor 2018-05-13 13:09:51 -04:00
parent 016dab3990
commit e2cd1fca58
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
depends/md5/CMakeLists.txt
Unescape Escape View File

@ -2,5 +2,5 @@ project(dfhack-md5)
ADD_LIBRARY(dfhack-md5 STATIC EXCLUDE_FROM_ALL md5.cpp md5wrapper.cpp) ADD_LIBRARY(dfhack-md5 STATIC EXCLUDE_FROM_ALL md5.cpp md5wrapper.cpp)
IDE_FOLDER(dfhack-md5 "Depends") IDE_FOLDER(dfhack-md5 "Depends")
IF(UNIX) IF(UNIX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing") SET_TARGET_PROPERTIES(dfhack-md5 PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing")
ENDIF() ENDIF()

4
plugins/embark-assistant/survey.cpp
Unescape Escape View File

@ -781,7 +781,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
survey_results->at(x).at(y).evilness_count[2] = 0; survey_results->at(x).at(y).evilness_count[2] = 0;
bool river_elevation_found = false; bool river_elevation_found = false;
int16_t river_elevation; int16_t river_elevation = 0;
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++) {
for (uint8_t k = 0; k < 16; k++) { for (uint8_t k = 0; k < 16; k++) {
@ -1006,7 +1006,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles *
uint16_t x = screen->location.region_pos.x; uint16_t x = screen->location.region_pos.x;
uint16_t y = screen->location.region_pos.y; uint16_t y = screen->location.region_pos.y;
bool river_found = false; bool river_found = false;
int16_t river_elevation; int16_t river_elevation = 0;
std::vector<bool> metals(state->max_inorganic); std::vector<bool> metals(state->max_inorganic);
std::vector<bool> economics(state->max_inorganic); std::vector<bool> economics(state->max_inorganic);
std::vector<bool> minerals(state->max_inorganic); std::vector<bool> minerals(state->max_inorganic);