mirror of
https://github.com/sfall-team/sfall.git
synced 2026-07-27 16:52:34 -07:00
Added "floor2" script function to work with ceil (#109)
Added the missing description of ceil to notes.txt. Disabled ceil marco in lib.math.h. Removed duplications in Utils.h.
This commit is contained in:
@@ -26,15 +26,14 @@ end
|
|||||||
return intp;
|
return intp;
|
||||||
end*/
|
end*/
|
||||||
|
|
||||||
procedure ceil(variable val) begin
|
/*procedure ceil(variable val) begin
|
||||||
variable intp;
|
variable intp;
|
||||||
intp := floor(val);
|
intp := floor(val);
|
||||||
if (abs(val-intp) > 0.0) then begin
|
if (abs(val-intp) > 0.0) then begin
|
||||||
intp++;
|
intp++;
|
||||||
end
|
end
|
||||||
return intp;
|
return intp;
|
||||||
end
|
end*/
|
||||||
|
|
||||||
|
|
||||||
procedure cap_number(variable num, variable min, variable max) begin
|
procedure cap_number(variable num, variable min, variable max) begin
|
||||||
if (num > max) then num := max;
|
if (num > max) then num := max;
|
||||||
|
|||||||
@@ -191,6 +191,7 @@
|
|||||||
|
|
||||||
#define critter_inven_obj2(obj, type) sfall_func2("critter_inven_obj2", obj, type)
|
#define critter_inven_obj2(obj, type) sfall_func2("critter_inven_obj2", obj, type)
|
||||||
#define exec_map_update_scripts sfall_func0("exec_map_update_scripts")
|
#define exec_map_update_scripts sfall_func0("exec_map_update_scripts")
|
||||||
|
#define floor2(value) sfall_func1("floor2", value)
|
||||||
#define intface_hide sfall_func0("intface_hide")
|
#define intface_hide sfall_func0("intface_hide")
|
||||||
#define intface_is_hidden sfall_func0("intface_is_hidden")
|
#define intface_is_hidden sfall_func0("intface_is_hidden")
|
||||||
#define intface_redraw sfall_func0("intface_redraw")
|
#define intface_redraw sfall_func0("intface_redraw")
|
||||||
|
|||||||
@@ -265,6 +265,9 @@ Some utility/math functions are available:
|
|||||||
> float exponent(float x)
|
> float exponent(float x)
|
||||||
- e^x
|
- e^x
|
||||||
|
|
||||||
|
> int ceil(float x)
|
||||||
|
- round x to the nearest integer that is not less than x
|
||||||
|
|
||||||
> int round(float x)
|
> int round(float x)
|
||||||
- round x to the nearest integer
|
- round x to the nearest integer
|
||||||
|
|
||||||
@@ -378,6 +381,10 @@ Some utility/math functions are available:
|
|||||||
- The file name is limited to 63 chars, including the extension
|
- The file name is limited to 63 chars, including the extension
|
||||||
- The section name is limited to 32 characters
|
- The section name is limited to 32 characters
|
||||||
|
|
||||||
|
> int sfall_func1("floor2", int/float value)
|
||||||
|
- works just like vanilla floor function, but returns correct integers for negative values
|
||||||
|
- vanilla floor function works exactly the same as ceil for negative values, much like trunc in C/C++
|
||||||
|
|
||||||
------------------------
|
------------------------
|
||||||
------ MORE INFO -------
|
------ MORE INFO -------
|
||||||
------------------------
|
------------------------
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ static const SfallMetarule metaruleArray[] = {
|
|||||||
{"intface_is_hidden", sf_intface_is_hidden, 0, 0},
|
{"intface_is_hidden", sf_intface_is_hidden, 0, 0},
|
||||||
{"exec_map_update_scripts", sf_exec_map_update_scripts, 0, 0},
|
{"exec_map_update_scripts", sf_exec_map_update_scripts, 0, 0},
|
||||||
{"set_ini_setting", sf_set_ini_setting, 2, 2},
|
{"set_ini_setting", sf_set_ini_setting, 2, 2},
|
||||||
|
{"floor2", sf_floor2, 1, 1},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void InitMetaruleTable() {
|
static void InitMetaruleTable() {
|
||||||
|
|||||||
@@ -891,3 +891,7 @@ static void _stdcall op_message_str_game2() {
|
|||||||
static void __declspec(naked) op_message_str_game() {
|
static void __declspec(naked) op_message_str_game() {
|
||||||
_WRAP_OPCODE(op_message_str_game2, 2, 1)
|
_WRAP_OPCODE(op_message_str_game2, 2, 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void sf_floor2() {
|
||||||
|
opHandler.setReturn(static_cast<int>(floor(opHandler.arg(0).asFloat())));
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user