From c21da7e9df7951ec67f8502a561bb25d80b8bac1 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 11 Nov 2012 22:12:51 +0000 Subject: [PATCH] Move similar/main/titles.c -> similar/main/titles.cpp --- SConstruct | 2 +- similar/main/{titles.c => titles.cpp} | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) rename similar/main/{titles.c => titles.cpp} (99%) diff --git a/SConstruct b/SConstruct index bdd019732..b602960ac 100644 --- a/SConstruct +++ b/SConstruct @@ -801,7 +801,7 @@ class DXXProgram(DXXCommon): 'main/terrain.cpp', 'main/texmerge.cpp', 'main/text.cpp', -'main/titles.c', +'main/titles.cpp', 'main/vclip.c', 'main/wall.c', 'main/weapon.c', diff --git a/similar/main/titles.c b/similar/main/titles.cpp similarity index 99% rename from similar/main/titles.c rename to similar/main/titles.cpp index 222dc7262..69eeb2b50 100644 --- a/similar/main/titles.c +++ b/similar/main/titles.cpp @@ -34,6 +34,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pcx.h" #include "u_mem.h" #include "joy.h" +#include "titles.h" #include "gamefont.h" #include "dxxerror.h" #include "polyobj.h" @@ -499,11 +500,11 @@ static void briefing_init(briefing *br, short level_num) //----------------------------------------------------------------------------- // Load Descent briefing text. -static int load_screen_text(char *filename, char **buf) +static int load_screen_text(const char *filename, char **buf) { PHYSFS_file *tfile; int len, have_binary = 0; - char *ext; + const char *ext; if ((ext = strrchr(filename, '.')) == NULL) return (0); @@ -1578,7 +1579,7 @@ static int briefing_handler(window *wind, d_event *event, briefing *br) return 0; } -void do_briefing_screens(char *filename, int level_num) +void do_briefing_screens(const char *filename, int level_num) { briefing *br; window *wind; @@ -1637,7 +1638,7 @@ void do_briefing_screens(char *filename, int level_num) event_process(); } -void do_end_briefing_screens(char *filename) +void do_end_briefing_screens(const char *filename) { int level_num_screen = Current_level_num, showorder = 0;