mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-22 04:01:23 +00:00
Number the FF conversation options.
svn-id: r22034
This commit is contained in:
parent
75542e0f95
commit
e97476621d
@ -1818,7 +1818,7 @@ void SimonEngine::o3_printLongText() {
|
||||
// 70: show string from array
|
||||
int num = getVarOrByte();
|
||||
const char *str = (const char *)getStringPtrByID(_stringIdArray3[num]);
|
||||
printInteractText(num, str);
|
||||
sendInteractText(num, "%d. %s\n", num, str);
|
||||
}
|
||||
|
||||
void SimonEngine::o3_addBox() {
|
||||
|
@ -695,6 +695,7 @@ protected:
|
||||
bool printTextOf(uint a, uint x, uint y);
|
||||
bool printNameOf(Item *item, uint x, uint y);
|
||||
void printInteractText(uint16 num, const char *string);
|
||||
void sendInteractText(uint16 num, const char *fmt, ...);
|
||||
void printScreenText(uint vga_sprite_id, uint color, const char *string_ptr, int16 x, int16 y, int16 width);
|
||||
|
||||
void renderStringAmiga(uint vga_sprite_id, uint color, uint width, uint height, const char *txt);
|
||||
|
@ -59,7 +59,7 @@ const char *getPixelLength(const char *string, uint16 maxWidth, uint16 &pixels)
|
||||
while (*string != 0) {
|
||||
byte chr = *string;
|
||||
if ((pixels + charWidth[chr]) > maxWidth)
|
||||
break;
|
||||
break;
|
||||
pixels += charWidth[chr];
|
||||
string++;
|
||||
}
|
||||
@ -175,6 +175,17 @@ void SimonEngine::printInteractText(uint16 num, const char *string) {
|
||||
_interactY += height;
|
||||
}
|
||||
|
||||
void SimonEngine::sendInteractText(uint16 num, const char *fmt, ...) {
|
||||
va_list arglist;
|
||||
char string[256];
|
||||
|
||||
va_start(arglist, fmt);
|
||||
vsprintf(string, fmt, arglist);
|
||||
va_end(arglist);
|
||||
|
||||
printInteractText(num, string);
|
||||
}
|
||||
|
||||
void SimonEngine::printScreenText(uint vgaSpriteId, uint color, const char *string, int16 x, int16 y, int16 width) {
|
||||
char convertedString[320];
|
||||
char *convertedString2 = convertedString;
|
||||
|
Loading…
x
Reference in New Issue
Block a user