AGS: Frequent use of bitwise OR/ANDs instead of logical operators [upstream "bug"]

[RainRat]

In scummvm\engines\ags\engine\ac\global_slider.cpp the SetSliderValue and GetSliderValue functions, the validation checks for the GUI number (guin) are using the bitwise OR operator (|) instead of the logical OR operator (||).

Affected Code:

void SetSliderValue(int guin, int objn, int valn) {
    if ((guin < 0) | (guin >= _GP(game).numgui)) quit("!SetSliderValue: invalid GUI number");
[...]
int GetSliderValue(int guin, int objn) {
    if ((guin < 0) | (guin >= _GP(game).numgui)) quit("!GetSliderValue: invalid GUI number");

Corrected Code:

void SetSliderValue(int guin, int objn, int valn) {
    if ((guin < 0) || (guin >= _GP(game).numgui)) quit("!SetSliderValue: invalid GUI number");
[...]
int GetSliderValue(int guin, int objn) {
    if ((guin < 0) || (guin >= _GP(game).numgui)) quit("!GetSliderValue: invalid GUI number");

[tag2015]

Thanks for the report!
This is an OR between booleans so although it's not good practice it shouldn't change anything (besides a minimal speed improvement)

There are quite a lot of similar occurrences in the AGS codebase (also with &) so we have to decide if we should fix them all or leave them as is...

I'll bump the priority to keep track, then we'll see

[RainRat]

If I find any more, I'll add them here, so they're in one place:

scummvm\engines\ags\engine\gui\new_control.cpp
Current:

int NewControl::mouseisinarea(int mx, int my) {
[...]
	if ((mx > x) &(mx < x + wid) &(my > y) &(my < y + hit))

Expected:

int NewControl::mouseisinarea(int mx, int my) {
[...]
	if ((mx > x) &&(mx < x + wid) &&(my > y) &&(my < y + hit))