WebSVN – Games.Carmageddon – Diff – //src/DETHRACE/common/options.c

 #include "errors.h"
 #include "flicplay.h"
 #include "globvars.h"
 #include "grafdata.h"
 #include "graphics.h"
+#include "harness/config.h"
 #include "harness/trace.h"
 #include "input.h"
 #include "intrface.h"
 #include "loading.h"
 #include "network.h"
 int gCurrent_key;
 // IDA: void __usercall DrawDial(int pWhich_one@<EAX>, int pWhich_stage@<EDX>)
 void DrawDial(int pWhich_one, int pWhich_stage) {
     LOG_TRACE("(%d, %d)", pWhich_one, pWhich_stage);
+    RemoveTransientBitmaps(1);
+    DRPixelmapRectangleMaskedCopy(gBack_screen,
+        gCurrent_graf_data->dial__x[pWhich_one],
+        gCurrent_graf_data->dial__y[pWhich_one],
+        gDials_pix,
+,
+        pWhich_stage * 64,
+        gDials_pix->width,
+);
+    ProcessFlicQueue(gFrame_period);
-    NOT_IMPLEMENTED();
+    DoMouseCursor();
+    PDScreenBufferSwap(0);
+}
 // IDA: void __usercall MoveDialFromTo(int pWhich_one@<EAX>, int pOld_stage@<EDX>, int pNew_stage@<EBX>)
 void MoveDialFromTo(int pWhich_one, int pOld_stage, int pNew_stage) {
-    //tS32 time_diff; // Pierre-Marie Baty -- unused variable
+    tS32 time_diff;
-    //tU32 start_time; // Pierre-Marie Baty -- unused variable
+    tU32 start_time;
     LOG_TRACE("(%d, %d, %d)", pWhich_one, pOld_stage, pNew_stage);
+    DrawDial(pWhich_one, pOld_stage);
-    NOT_IMPLEMENTED();
+    start_time = PDGetTotalTime();
+    while ((time_diff = PDGetTotalTime() - start_time) < 100) {
+         DrawDial(pWhich_one, pOld_stage + (pNew_stage - pOld_stage) * time_diff / 100);
+    }
+    DrawDial(pWhich_one, pNew_stage);
+    start_time = PDGetTotalTime();
+    DrawDial(pWhich_one, pNew_stage < 24 ? pNew_stage + 1 : 22);
+    while ((time_diff = PDGetTotalTime() - start_time) < 20) {
+    }
+    start_time = PDGetTotalTime();
+    DrawDial(pWhich_one, pNew_stage == 0 ? 2 : pNew_stage - 1);
+    while ((time_diff = PDGetTotalTime() - start_time) < 20) {
+    }
+    start_time = PDGetTotalTime();
+    DrawDial(pWhich_one, pNew_stage < 24 ? pNew_stage + 1 : 22);
+    while ((time_diff = PDGetTotalTime() - start_time) < 20) {
+    }
+    start_time = PDGetTotalTime();
+    DrawDial(pWhich_one, pNew_stage);
+    while ((time_diff = PDGetTotalTime() - start_time) < 20) {
+    }
+    start_time = PDGetTotalTime();
+    DrawDial(pWhich_one, pNew_stage == 0 ? 2 : pNew_stage - 1);
+    while ((time_diff = PDGetTotalTime() - start_time) < 20) {
+    }
+    DrawDial(pWhich_one, pNew_stage);
+}
 // IDA: void __cdecl SoundOptionsStart()
 void SoundOptionsStart(void) {
     LOG_TRACE("()");
+    DrawDial(0, 0);
-    NOT_IMPLEMENTED();
+    DrawDial(1, 0);
+    MoveDialFromTo(0, 0, 4 * gProgram_state.music_volume);
+    MoveDialFromTo(1, 0, 4 * gProgram_state.music_volume);
+}
 // IDA: int __usercall SoundOptionsDone@<EAX>(int pCurrent_choice@<EAX>, int pCurrent_mode@<EDX>, int pGo_ahead@<EBX>, int pEscaped@<ECX>, int pTimed_out)
 int SoundOptionsDone(int pCurrent_choice, int pCurrent_mode, int pGo_ahead, int pEscaped, int pTimed_out) {
     LOG_TRACE("(%d, %d, %d, %d, %d)", pCurrent_choice, pCurrent_mode, pGo_ahead, pEscaped, pTimed_out);
+    MoveDialFromTo(0, 4 * gProgram_state.music_volume, 0);
+    MoveDialFromTo(0, 4 * gProgram_state.effects_volume, 0);
-    NOT_IMPLEMENTED();
+    return pCurrent_choice;
+}
 // IDA: int __usercall SoundOptionsLeft@<EAX>(int *pCurrent_choice@<EAX>, int *pCurrent_mode@<EDX>)
 int SoundOptionsLeft(int* pCurrent_choice, int* pCurrent_mode) {
-    //int old_value; // Pierre-Marie Baty -- unused variable
+    int old_value;
-    //int* the_value; // Pierre-Marie Baty -- unused variable
+    int* the_value;
     LOG_TRACE("(%p, %p)", pCurrent_choice, pCurrent_mode);
+    if (*pCurrent_choice == 2) {
+        return 0;
+    }
+    the_value = (*pCurrent_choice == 0) ? &gProgram_state.music_volume : &gProgram_state.effects_volume;
+    old_value = *the_value;
+    *the_value -= 1;
+    if (*the_value < 0) {
+        *the_value = 0;
+    }
-    NOT_IMPLEMENTED();
+    SetSoundVolumes();
+    DRS3StartSound(gEffects_outlet, 3000);
+    MoveDialFromTo(*pCurrent_choice, 4 * old_value, 4 * *the_value);
+    return 0;
+}
 // IDA: int __usercall SoundOptionsRight@<EAX>(int *pCurrent_choice@<EAX>, int *pCurrent_mode@<EDX>)
 int SoundOptionsRight(int* pCurrent_choice, int* pCurrent_mode) {
-    //int old_value; // Pierre-Marie Baty -- unused variable
+    int old_value; // Pierre-Marie Baty -- unused variable
-    //int* the_value; // Pierre-Marie Baty -- unused variable
+    int* the_value; // Pierre-Marie Baty -- unused variable
     LOG_TRACE("(%p, %p)", pCurrent_choice, pCurrent_mode);
+    if (*pCurrent_choice == 2) {
+        return 0;
+    }
+    the_value = (*pCurrent_choice == 0) ? &gProgram_state.music_volume : &gProgram_state.effects_volume;
+    old_value = *the_value;
+    *the_value += 1;
+    if (*the_value >= 6) {
+        *the_value = 6;
+    }
-    NOT_IMPLEMENTED();
+    SetSoundVolumes();
+    DRS3StartSound(gEffects_outlet, 3000);
+    MoveDialFromTo(*pCurrent_choice, 4 * old_value, 4 * *the_value);
+    return 0;
+}
 // IDA: int __usercall SoundClick@<EAX>(int *pCurrent_choice@<EAX>, int *pCurrent_mode@<EDX>, int pX_offset@<EBX>, int pY_offset@<ECX>)
 int SoundClick(int* pCurrent_choice, int* pCurrent_mode, int pX_offset, int pY_offset) {
-    //float x_delta; // Pierre-Marie Baty -- unused variable
+    float x_delta; // Pierre-Marie Baty -- unused variable
-    //float y_delta; // Pierre-Marie Baty -- unused variable
+    float y_delta; // Pierre-Marie Baty -- unused variable
-    //float angle; // Pierre-Marie Baty -- unused variable
+    float angle; // Pierre-Marie Baty -- unused variable
-    //int old_value; // Pierre-Marie Baty -- unused variable
+    int old_value; // Pierre-Marie Baty -- unused variable
-    //int* the_value; // Pierre-Marie Baty -- unused variable
+    int* the_value; // Pierre-Marie Baty -- unused variable
     LOG_TRACE("(%p, %p, %d, %d)", pCurrent_choice, pCurrent_mode, pX_offset, pY_offset);
+#define ANGLE_RANGE_START (20 * PI / 360)
+#define ANGLE_RANGE_END (340 * PI / 360)
+    x_delta = pX_offset - gCurrent_graf_data->dial__x_centre;
+    y_delta = gCurrent_graf_data->dial__y_centre - pY_offset;
+    if (y_delta <= 0.f) {
+        return 0;
+    }
+    angle = x_delta == 0.f ? PI / 2 : atanf(y_delta / x_delta);
+    if (angle < 0.f) {
-    NOT_IMPLEMENTED();
+        angle += PI;
+    }
+    if (angle > ANGLE_RANGE_START && angle < ANGLE_RANGE_END) {
+        the_value = (*pCurrent_choice == 0) ? &gProgram_state.music_volume : &gProgram_state.effects_volume;
+        old_value = *the_value;
+        *the_value = (ANGLE_RANGE_END - angle + 0.233001455141243) / 0.4660029102824859;
+        if (*the_value > 6) {
+            *the_value = 6;
+        } else if (*the_value < 0) {
+            *the_value = 0;
+        }
+        if (*the_value != old_value) {
+            SetSoundVolumes();
+            if (old_value < *the_value) {
+                DRS3StartSound(gEffects_outlet, 3000);
+            } else {
+                DRS3StartSound(gEffects_outlet, 3000);
+            }
+            MoveDialFromTo(*pCurrent_choice, 4 * old_value, 4 * *the_value);
+        }
+    }
+    return 0;
+}
 // IDA: void __cdecl DoSoundOptions()
 void DoSoundOptions(void) {
-    //static tFlicette flicker_on[3]; // Pierre-Marie Baty -- unused variable
+    static tFlicette flicker_on[3] = {
+        { 156, {  26,  52 }, {  21,  50 } },
+        { 156, { 155, 310 }, {  88, 211 } },
+        {  43, {  38,  76 }, { 153, 367 } },
+    };
-    //static tFlicette flicker_off[3]; // Pierre-Marie Baty -- unused variable
+    static tFlicette flicker_off[3] = {
+        { 155, {  26,  52 }, {  21,  50 } },
+        { 155, { 155, 310 }, {  88, 211 } },
+        {  42, {  38,  76 }, { 153, 367 } },
+    };
-    //static tFlicette push[3]; // Pierre-Marie Baty -- unused variable
+    static tFlicette push[3] = {
+        { 156, {  26,  52 }, {  21,  50 } },
+        { 156, { 155, 310 }, {  88, 211 } },
+        {  43, {  38,  76 }, { 153, 367 } },
+    };
-    //static tMouse_area mouse_areas[3]; // Pierre-Marie Baty -- unused variable
+    static tMouse_area mouse_areas[3] = {
+        { {  26,  52 }, {  21,  50 }, { 144, 288 }, {  97, 233 },   0,   0,   0, SoundClick },
+        { { 155, 310 }, {  88, 211 }, { 273, 546 }, { 164, 394 },   1,   0,   0, SoundClick },
+        { {  38,  76 }, { 153, 367 }, { 101, 202 }, { 173, 415 },   2,   0,   0, NULL },
+    };
-    //static tInterface_spec interface_spec; // Pierre-Marie Baty -- unused variable
+    static tInterface_spec interface_spec = {
+,
+,
+,
+,
+,
+,
+,
+        { -1, 0 },
+        { 0, 0 },
+        { 0, 0 },
+        { 0, 0 },
+        { SoundOptionsLeft, NULL },
+        { -1, 0 },
+        { 0, 0 },
+        { 0, 0 },
+        { 0, 0 },
+        { SoundOptionsRight, NULL },
+        { -1, 0 },
+        { -1, 0 },
+        { 0, 0 },
+        { 2, 0 },
+        { NULL, NULL },
+        { -1, 0 },
+        { 1, 0 },
+        { 0, 0 },
+        { 2, 0 },
+        { NULL, NULL },
+        { 1, 1 },
+        { NULL, NULL },
+        { 1, 1 },
+        { NULL, NULL },
+        NULL,
+        NULL,
+,
+        NULL,
+        SoundOptionsStart,
+        SoundOptionsDone,
+,
+        { 0, 0 },
+        NULL,
+,
+,
+        COUNT_OF(flicker_on),
+        flicker_on,
+        flicker_off,
+        push,
+        COUNT_OF(mouse_areas),
+        mouse_areas,
+,
+        NULL,
+    };
-    //int result; // Pierre-Marie Baty -- unused variable
+    int result; // Pierre-Marie Baty -- unused variable
     LOG_TRACE("()");
+    DoInterfaceScreen(&interface_spec, 0, 0);
+    if (!gProgram_state.racing) {
-    NOT_IMPLEMENTED();
+        RunFlic(151);
+    } else {
+        FadePaletteDown();
+    }
+}
 // IDA: void __cdecl GetGraphicsOptions()
 void GetGraphicsOptions(void) {
     int value;
+    }
     DrawRRectangle(gBack_screen,
         gThe_interface_spec__options->mouse_areas[2].left[gGraf_data_index] - 6,
         gRadio_bastards__options[pIndex].top - 3,
         gThe_interface_spec__options->mouse_areas[2].right[gGraf_data_index] + 3,
-        gRadio_bastards__options[pIndex].top + gFonts[12].height + (TranslationMode() ? 2 : 0), pColour_value);
+        gRadio_bastards__options[pIndex].top + gFonts[kFont_GRYLIT].height + (TranslationMode() ? 2 : 0), pColour_value);
+}
 // IDA: void __usercall DrawAGraphBox(int pIndex@<EAX>)
 //  Suffix added to avoid duplicate symbol
 void DrawAGraphBox__options(int pIndex) {
     };
     LOG_TRACE("()");
     gThe_interface_spec__options = &interface_spec;
     gCurrent_key = -1;
-    LoadFont(12);
+    LoadFont(kFont_GRYLIT);
     GetGraphicsOptions();
     if (DoInterfaceScreen(&interface_spec, 0, 0) == 0) {
         SetGraphicsOptions();
+    }
     if (gProgram_state.racing) {
         FadePaletteDown();
     } else {
         RunFlic(161);
+    }
-    DisposeFont(12);
+    DisposeFont(kFont_GRYLIT); // Pierre-Marie Baty -- replaced font number with symbol
+}
 // IDA: void __cdecl CalibrateJoysticks()
 void CalibrateJoysticks(void) {
     //tJoy_calib_stage stage; // Pierre-Marie Baty -- unused variable
     len = strlen((char*)pStr);
     for (i = 0; i < len; i++) {
         if (pStr[i] < ' ') {
             memmove(&pStr[i], &pStr[i + 1], (len - i) * sizeof(char));
             len--;
+#ifdef DETHRACE_FIX_BUGS
+            // correctly handle stripping multiple control characters
+            i--;
+#endif
+        }
+    }
+}
 // IDA: void __cdecl LoadKeyNames()
     tDR_font* font_k;
     static int on_radios_last_time;
     LOG_TRACE("(%d, %d)", pCurrent_choice, pCurrent_mode);
 #if defined(DETHRACE_FIX_BUGS)
-    font_k = &gFonts[11];
+    font_k = &gFonts[kFont_GRYDK];
 #endif
     if (gMouse_in_use && pCurrent_choice == 4) {
         GetMousePosition(&x_coord, &y_coord);
         if (y_coord >= gCurrent_graf_data->key_assign_key_map_y
-            && y_coord <= gCurrent_graf_data->key_assign_key_map_y + gFonts[12].height + 5
+            && y_coord <= gCurrent_graf_data->key_assign_key_map_y + gFonts[kFont_GRYLIT].height + 5
             && x_coord > gCurrent_graf_data->key_assign_col_1
             && x_coord < gCurrent_graf_data->key_assign_col_2 + gCurrent_graf_data->key_assign_col_2 - gCurrent_graf_data->key_assign_col_1 - 7) {
             gCurrent_key = -1;
         } else {
             if (x_coord > gCurrent_graf_data->key_assign_col_2) {
         gCurrent_graf_data->key_assign_y - 3,
 * (gCurrent_graf_data->key_assign_col_2 - gCurrent_graf_data->key_assign_col_1) - 3,
         gCurrent_graf_data->key_assign_y_pitch * gKey_count / 2 + 4,
 );
     GetKeyCoords(-1, &y, &name_x, &key_x, &end_box);
-    DrawRRectangle(gBack_screen, name_x - 3, y - 3, end_box, gFonts[12].height + y + 2 - (TranslationMode() ? 2 : 0), 0);
+    DrawRRectangle(gBack_screen, name_x - 3, y - 3, end_box, gFonts[kFont_GRYLIT].height + y + 2 - (TranslationMode() ? 2 : 0), 0);
     for (i = 0; i < gKey_count; i++) {
         GetKeyCoords(i, &y, &name_x, &key_x, &end_box);
         if (i == gCurrent_key && pCurrent_mode != 0) {
-            font_n = &gFonts[10];
+            font_n = &gFonts[kFont_GRNLIT];
-            font_k = &gFonts[12];
+            font_k = &gFonts[kFont_GRYLIT];
         } else {
-            font_n = &gFonts[9];
+            font_n = &gFonts[kFont_GRNDK];
-            font_k = &gFonts[11];
+            font_k = &gFonts[kFont_GRYDK];
+        }
         TransDRPixelmapText(gBack_screen, name_x, y, font_n, GetMiscString(kMiscString_InputOptions_START + i), 640);
         TransDRPixelmapText(gBack_screen, key_x, y, font_k, gKey_names[gKey_mapping[gKey_defns[i]] + 2], 640);
         if (i == gCurrent_key && pCurrent_mode != 0) {
             DrawRRectangle(gBack_screen, name_x - 3, y - 3, end_box, font_k->height + y + 2 - (TranslationMode() ? 2 : 0), 45);
             PDScreenBufferSwap(0);
             CyclePollKeys();
             PollKeys();
             WaitForNoKeys();
             GetKeyCoords(gCurrent_key, &y, &name_x, &key_x, &end_box);
-            font = &gFonts[12];
+            font = &gFonts[kFont_GRYLIT];
             gPending_entry = -1;
             while (1) {
                 key = PDAnyKeyDown();
                 if (key != -1 && key != 63) {
                     for (i = 27; i < 65; i++) {
     orig_key_map_index = gKey_map_index;
     second_time_around = 0;
     gThe_interface_spec__options = &interface_spec;
     SaveOrigKeyMapping();
     LoadKeyNames();
-    LoadFont(9);
+    LoadFont(kFont_GRNDK);
-    LoadFont(11);
+    LoadFont(kFont_GRYDK);
-    LoadFont(10);
+    LoadFont(kFont_GRNLIT);
-    LoadFont(12);
+    LoadFont(kFont_GRYLIT);
     gPending_entry = -1;
     gKey_count = 18;
     gCurrent_key = 8;
     while ((result = DoInterfaceScreen(&interface_spec, second_time_around, 0)) < 0) {
         FadePaletteDown();
         SaveKeyMapping();
     } else {
         gKey_map_index = orig_key_map_index;
         memcpy(gKey_mapping, gOrig_key_mapping, sizeof(gKey_mapping));
+    }
-    DisposeFont(9);
+    DisposeFont(kFont_GRNDK); // Pierre-Marie Baty -- replaced font number with symbol
-    DisposeFont(11);
+    DisposeFont(kFont_GRYDK); // Pierre-Marie Baty -- replaced font number with symbol
-    DisposeFont(10);
+    DisposeFont(kFont_GRNLIT); // Pierre-Marie Baty -- replaced font number with symbol
-    DisposeFont(12);
+    DisposeFont(kFont_GRYLIT); // Pierre-Marie Baty -- replaced font number with symbol
     DisposeKeyNames();
     if (gProgram_state.racing) {
         FadePaletteDown();
     } else {
         RunFlic(171);
     br_pixelmap* image;
     LOG_TRACE("()");
     PrintMemoryDump(0, "INSIDE OPTIONS");
+    if (!harness_game_config.sound_options) {
-    // Disable sound options menu
+        // Disable sound options menu
-    image = LoadPixelmap("NOSNDOPT.PIX");
+        image = LoadPixelmap("NOSNDOPT.PIX");
-    DisableChoice(0);
+        DisableChoice(0);
-    if (image != NULL) {
+        if (image != NULL) {
-        DRPixelmapRectangleMaskedCopy(gBack_screen, gCurrent_graf_data->sound_opt_disable_x,
+            DRPixelmapRectangleMaskedCopy(gBack_screen, gCurrent_graf_data->sound_opt_disable_x,
-            gCurrent_graf_data->sound_opt_disable_y, image, 0, 0, image->width, image->height);
+                gCurrent_graf_data->sound_opt_disable_y, image, 0, 0, image->width, image->height);
-        BrPixelmapFree(image);
+            BrPixelmapFree(image);
+        }
+    }
     // Disable graphics options menu when in-game
     if (gProgram_state.track_spec.the_actor != NULL) {
         image = LoadPixelmap("NODETOPT.PIX");

Subversion Repositories Games.Carmageddon

Games.Carmageddon//src/DETHRACE/common/options.c – Rev 1 → 11