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

 #include "racesumm.h"
-#include "brender/brender.h"
+#include "brender.h"
 #include "crush.h"
 #include "cutscene.h"
 #include "displays.h"
 #include "flicplay.h"
 #include "globvars.h"
     LOG_TRACE("(%d, %d)", pCurrent_choice, pCurrent_mode);
     if (((pCurrent_choice == 0 && pCurrent_mode == 0) || !gDone_initial) && (gWreck_zoomed_in < 0 && gWreck_selected >= 0)) {
         sel_actor = BrActorAllocate(BR_ACTOR_MODEL, NULL);
         sel_actor->render_style = BR_RSTYLE_BOUNDING_EDGES;
-        sel_actor->render_style = BR_RSTYLE_NONE; // FIXME: remove this line once BR_RSTYLE_BOUNDING_EDGES rener style has been implemente
         sel_actor->model = gWreck_array[gWreck_selected].actor->model;
         BrActorAdd(gWreck_array[gWreck_selected].actor, sel_actor);
     } else {
         sel_actor = NULL;
+    }
 // IDA: void __usercall DrawAnItem(int pX@<EAX>, int pY_index@<EDX>, int pFont_index@<EBX>, char *pText@<ECX>)
 //  Suffix added to avoid duplicate symbol
 void DrawAnItem__racesumm(int pX, int pY_index, int pFont_index, char* pText) {
     LOG_TRACE("(%d, %d, %d, \"%s\")", pX, pY_index, pFont_index, pText);
+    TransBrPixelmapText(gBack_screen,
+        pX,
+        gCurrent_graf_data->net_sum_headings_y + gCurrent_graf_data->net_sum_y_pitch * pY_index,
+        pFont_index,
+        gFont_7,
-    NOT_IMPLEMENTED();
+        pText);
+}
 // IDA: void __usercall DrawColumnHeading(int pStr_index@<EAX>, int pX@<EDX>)
 //  Suffix added to avoid duplicate symbol
 void DrawColumnHeading__racesumm(int pStr_index, int pX) {
     LOG_TRACE("(%d, %d)", pStr_index, pX);
+    TransBrPixelmapText(gBack_screen,
+        pX,
+        gCurrent_graf_data->net_sum_headings_y - gCurrent_graf_data->net_sum_y_pitch,
+,
+        gFont_7,
+        GetMiscString(pStr_index));
+}
 // IDA: int __usercall SortScores@<EAX>(void *pFirst_one@<EAX>, void *pSecond_one@<EDX>)
-int SortScores(void* pFirst_one, void* pSecond_one) {
+int SortScores(const void* pFirst_one, const void* pSecond_one) {
     LOG_TRACE("(%p, %p)", pFirst_one, pSecond_one);
-    NOT_IMPLEMENTED();
+    return gNet_players[*(int*)pSecond_one].games_score - gNet_players[*(int*)pFirst_one].games_score;
+}
 // IDA: void __cdecl SortGameScores()
 void SortGameScores(void) {
     LOG_TRACE("()");
-    NOT_IMPLEMENTED();
+    qsort(gPlayer_lookup, gNumber_of_net_players, sizeof(gPlayer_lookup[0]), SortScores);
+}
 // IDA: void __usercall NetSumDraw(int pCurrent_choice@<EAX>, int pCurrent_mode@<EDX>)
 void NetSumDraw(int pCurrent_choice, int pCurrent_mode) {
-    //int i; // Pierre-Marie Baty -- unused variable
+    int i;
-    //char s[256]; // Pierre-Marie Baty -- unused variable
+    char s[256];
-    //tNet_game_player_info* player; // Pierre-Marie Baty -- unused variable
+    tNet_game_player_info* player;
     LOG_TRACE("(%d, %d)", pCurrent_choice, pCurrent_mode);
+    DrawColumnHeading__racesumm(kMiscString_PLAYED, gCurrent_graf_data->net_sum_x_3);
+    DrawColumnHeading__racesumm(kMiscString_WON, gCurrent_graf_data->net_sum_x_4);
+    DrawColumnHeading__racesumm(kMiscString_SCORE, gCurrent_graf_data->net_sum_x_5);
+    BrPixelmapLine(gBack_screen,
+        gCurrent_graf_data->net_sum_x_1,
+        gCurrent_graf_data->net_sum_headings_y + 1 + gFont_7->glyph_y - gCurrent_graf_data->net_sum_y_pitch,
+        gBack_screen->width - gCurrent_graf_data->net_sum_x_1,
+        gCurrent_graf_data->net_sum_headings_y + 1 + gFont_7->glyph_y - gCurrent_graf_data->net_sum_y_pitch,
+);
+    for (i = 0; i < gNumber_of_net_players; i++) {
+        player = &gNet_players[gPlayer_lookup[i]];
+        strcpy(s, player->player_name);
+        if (player->host) {
+            strcat(s, " -");
+            strcat(s, GetMiscString(kMiscString_HOST));
-    NOT_IMPLEMENTED();
+            strcat(s, "-");
+        }
+        TurnOffPaletteConversion();
+        DRPixelmapRectangleMaskedCopy(gBack_screen,
+            gCurrent_graf_data->net_sum_x_1,
+            gCurrent_graf_data->net_sum_headings_y + 1 + i * gCurrent_graf_data->net_sum_y_pitch,
+            gIcons_pix_low_res,  /* DOS version uses low res, Windows version uses normal res */
+,
+            gCurrent_graf_data->net_head_icon_height * player->car_index,
+            gIcons_pix_low_res->width,  /* DOS version uses low res, Windows version uses normal res */
+            gCurrent_graf_data->net_head_icon_height);
+        TurnOnPaletteConversion();
+        DrawAnItem__racesumm(gCurrent_graf_data->net_sum_x_2, i, 83, s);
+        sprintf(s, "%d", player->played);
+        DrawAnItem__racesumm(gCurrent_graf_data->net_sum_x_3, i, 83, s);
+        sprintf(s, "%d", player->won);
+        DrawAnItem__racesumm(gCurrent_graf_data->net_sum_x_4, i, 83, s);
+        sprintf(s, "%d", player->games_score);
+        DrawAnItem__racesumm(gCurrent_graf_data->net_sum_x_5, i, 83, s);
+    }
+}
 // IDA: void __cdecl DoNetRaceSummary()
 void DoNetRaceSummary(void) {
-    //static tFlicette flicker_on[1]; // Pierre-Marie Baty -- unused variable
+    static tFlicette flicker_on[1] = { { 321, { 219, 112 }, { 172, 362 } } };
-    //static tFlicette flicker_off[1]; // Pierre-Marie Baty -- unused variable
+    static tFlicette flicker_off[1] = { { 322, { 219, 112 }, { 172, 362 } } };
-    //static tFlicette push[1]; // Pierre-Marie Baty -- unused variable
+    static tFlicette push[1] = { { 323, { 219, 112 }, { 172, 362 } } };
-    //static tMouse_area mouse_areas[1]; // Pierre-Marie Baty -- unused variable
+    static tMouse_area mouse_areas[1] = { { { 219, 112 }, { 172, 362 }, { 282, 182 }, { 192, 379 }, 0, 0, 0, NULL } };
-    //static tInterface_spec interface_spec; // Pierre-Marie Baty -- unused variable
+    static tInterface_spec interface_spec = {
+,              // initial_imode
+,             // first_opening_flic
+,              // second_opening_flic
+        -1,             // end_flic_go_ahead
+        -1,             // end_flic_escaped
+        -1,             // end_flic_otherwise
+,              // flic_bunch_to_load
+        { -1, 0 },      // move_left_new_mode
+        { 0, 0 },       // move_left_delta
+        { 0, 0 },       // move_left_min
+        { 0, 0 },       // move_left_max
+        { NULL, NULL }, // move_left_proc
+        { -1, 0 },      // move_right_new_mode
+        { 0, 0 },       // move_right_delta
+        { 0, 0 },       // move_right_min
+        { 0, 0 },       // move_right_max
+        { NULL, NULL }, // move_right_proc
+        { -1, 0 },      // move_up_new_mode
+        { 0, 0 },       // move_up_delta
+        { 0, 0 },       // move_up_min
+        { 0, 0 },       // move_up_max
+        { NULL, NULL }, // move_up_proc
+        { -1, 0 },      // move_down_new_mode
+        { 0, 0 },       // move_down_delta
+        { 0, 0 },       // move_down_min
+        { 0, 0 },       // move_down_max
+        { NULL, NULL }, // move_down_proc
+        { 1, 1 },       // go_ahead_allowed
+        { NULL, NULL }, // go_ahead_proc
+        { 1, 1 },       // escape_allowed
+        { NULL, NULL }, // escape_proc
+        NULL,           // exit_proc
+        &NetSumDraw,    // draw_proc
+,          // time_out
+        NULL,           // start_proc1
+        NULL,           // start_proc2
+        NULL,           // done_proc
+,              // font_needed
+        { 0, 0 },       // typeable
+        NULL,           // get_original_string
+,              // escape_code
+,              // dont_save_or_load
+,              // number_of_button_flics
+        flicker_on,     // flicker_on_flics
+        flicker_off,    // flicker_off_flics
+        push,           // pushed_flics
-    //int i; // Pierre-Marie Baty -- unused variable
+,              // number_of_mouse_areas
-    //int result; // Pierre-Marie Baty -- unused variable
+        mouse_areas,    // mouse_areas
-    //tS32 start_time; // Pierre-Marie Baty -- unused variable
+,              // number_of_recopy_areas
+        NULL            // recopy_areas
+    };
+    int i;
+    int result;
+    tS32 start_time;
     LOG_TRACE("()");
+    NetPlayerStatusChanged(ePlayer_status_summary);
+    start_time = PDGetTotalTime();
+    while (!gReceived_game_scores && PDGetTotalTime() - start_time < 20000) {
-    NOT_IMPLEMENTED();
+        NetService(0);
+    }
+    if (gReceived_game_scores) {
+        for (i = 0; i < gNumber_of_net_players; i++) {
+            gPlayer_lookup[i] = i;
+        }
+        SortGameScores();
+        TurnOnPaletteConversion();
+        DoInterfaceScreen(&interface_spec, 0, 0);
+        NetPlayerStatusChanged(ePlayer_status_loading);
+        TurnOffPaletteConversion();
+        FadePaletteDown();
+    }
+}
 // IDA: tSO_result __usercall DoEndRaceSummary@<EAX>(int *pFirst_summary_done@<EAX>, tRace_result pRace_result@<EDX>)
 tSO_result DoEndRaceSummary(int* pFirst_summary_done, tRace_result pRace_result) {
     tSO_result result;

Subversion Repositories Games.Carmageddon

Games.Carmageddon//src/DETHRACE/common/racesumm.c – Rev 1 → 18