diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index c0885ead..c4aa3fb5 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -3223,15 +3223,15 @@ SDL_Color Graphics::bigchunkygetcol(int t) return color; } -void Graphics::textboxforcepos(int x, int y) +void Graphics::textboxabsolutepos(int x, int y) { if (!INBOUNDS_VEC(m, textboxes)) { - vlog_error("textboxforcepos() out-of-bounds!"); + vlog_error("textboxabsolutepos() out-of-bounds!"); return; } - textboxes[m].position_forced = true; + textboxes[m].position_absolute = true; textboxes[m].xp = x; textboxes[m].yp = y; } diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h index ae93e42d..ea9a2130 100644 --- a/desktop_version/src/Graphics.h +++ b/desktop_version/src/Graphics.h @@ -94,7 +94,7 @@ public: int r, int g, int b ); - void textboxforcepos(int x, int y); + void textboxabsolutepos(int x, int y); void textboxcenterx(void); diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 81c9717d..75c518d8 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -53,7 +53,7 @@ scriptclass::scriptclass(void) textlarge = false; textbox_sprites.clear(); textbox_image = TEXTIMAGE_NONE; - textbox_forcepos = false; + textbox_absolutepos = false; } void scriptclass::add_default_colours(void) @@ -567,7 +567,7 @@ void scriptclass::run(void) textcrewmateposition = TextboxCrewmatePosition(); textbox_sprites.clear(); textbox_image = TEXTIMAGE_NONE; - textbox_forcepos = false; + textbox_absolutepos = false; textbox_force_outline = false; textbox_outline = false; } @@ -575,7 +575,7 @@ void scriptclass::run(void) { //are we facing left or right? for some objects we don't care, default at 0. j = 0; - textbox_forcepos = false; + textbox_absolutepos = false; //the first word is the object to position relative to if (words[1] == "centerx") @@ -597,11 +597,11 @@ void scriptclass::run(void) textx = -500; texty = -500; } - else if (words[1] == "force") + else if (words[1] == "absolute") { words[2] = "donothing"; j = -1; - textbox_forcepos = true; + textbox_absolutepos = true; } else // Well, are they asking for a crewmate...? @@ -803,9 +803,9 @@ void scriptclass::run(void) graphics.setimage(textbox_image); - if (textbox_forcepos) + if (textbox_absolutepos) { - graphics.textboxforcepos(textx, texty); + graphics.textboxabsolutepos(textx, texty); } else { diff --git a/desktop_version/src/Script.h b/desktop_version/src/Script.h index 2f9ee29e..07607def 100644 --- a/desktop_version/src/Script.h +++ b/desktop_version/src/Script.h @@ -122,7 +122,7 @@ public: int textboxtimer; std::vector textbox_sprites; TextboxImage textbox_image; - bool textbox_forcepos; + bool textbox_absolutepos; bool textbox_force_outline; bool textbox_outline; diff --git a/desktop_version/src/Textbox.cpp b/desktop_version/src/Textbox.cpp index 0a164b03..40285c8e 100644 --- a/desktop_version/src/Textbox.cpp +++ b/desktop_version/src/Textbox.cpp @@ -29,7 +29,7 @@ textboxclass::textboxclass(int gap) large = false; - position_forced = false; + position_absolute = false; should_centerx = false; should_centery = false; @@ -83,7 +83,7 @@ void textboxclass::centery(void) void textboxclass::applyposition(void) { resize(); - if (!position_forced) + if (!position_absolute) { reposition(); if (should_centerx) diff --git a/desktop_version/src/Textbox.h b/desktop_version/src/Textbox.h index ad3e1546..1e09b1bf 100644 --- a/desktop_version/src/Textbox.h +++ b/desktop_version/src/Textbox.h @@ -125,7 +125,7 @@ public: bool large; - bool position_forced; + bool position_absolute; bool should_centerx; bool should_centery;