Fix D1 build
Commit4cc801f
changed `object_move_one` to return `window_event_result` instead of `void` and added a default return value at the bottom. However, it added the value inside a `#if D2` block, so the D1 build now fails with: similar/main/object.cpp: In function 'dcx::window_event_result d1x::object_move_one(d1x::vobjptridx_t)': similar/main/object.cpp:1627:7: error: variable 'result' set but not used [-Werror=unused-but-set-variable] similar/main/object.cpp:1866:1: error: control reaches end of non-void function [-Werror=return-type] Move the return statement out of the conditional block to fix both these errors. Fixes:4cc801f42f
("Remove calls to window_close(Game_wind) when game finished or over")
This commit is contained in:
parent
0acddd0a35
commit
5201218e20
|
@ -1861,8 +1861,8 @@ static window_event_result object_move_one(const vobjptridx_t obj)
|
|||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue