Ticket #9271: scummex-cleanup-code-r20579.patch

File scummex-cleanup-code-r20579.patch, 46.2 KB (added by SF/winterheart, 10 years ago)
  • Makefile

     
    1010CP      := cp
    1111
    1212BUILD_MAC  :=
    13 WX_VERSION := 2.5
     13WX_VERSION := 2.8
    1414
    1515RESSW    := --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
    1616REZ_CMD  := `wx-config --version=$(WX_VERSION) --rezflags`
  • wxwindows.cpp

     
    160160void ImageScrolledWindow::OnPaint(wxPaintEvent &event) {
    161161        wxPaintDC dc(this);
    162162        PrepareDC(dc);
    163         dc.DrawBitmap(wxBitmap(_imageWindow->_image), 0, 0);
     163        dc.DrawBitmap(wxBitmap(* _imageWindow->_image), 0, 0);
    164164}
    165165
    166166BEGIN_EVENT_TABLE(ImageWindow, wxFrame)
     
    245245
    246246void ImageWindow::DrawImage() {
    247247        wxClientDC dc(this);
    248         dc.DrawBitmap(wxBitmap(_image), 0, 0);
     248        dc.DrawBitmap(wxBitmap(* _image), 0, 0);
    249249        Show(TRUE);
    250250        Refresh();
    251251}
     
    791791        BlocksSizer->Add(InfosSizer, 1, wxALL|wxEXPAND, 5);
    792792
    793793        notebook = new wxNotebook(panel, -1, wxPoint(-1, -1), wxSize(-1, -1), 0, wxT("notebook"));
     794
     795        InfosSizer->Add(notebook, 1,    wxALL|wxEXPAND, 0);
    794796       
    795         wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
    796         InfosSizer->Add(nbs, 1, wxALL|wxEXPAND, 0);
    797        
    798797        //
    799798        // Explorer panel
    800799        //     
  • file.h

     
    6666        void writeUint32LE(uint32 value);
    6767        void writeUint16BE(uint16 value);
    6868        void writeUint32BE(uint32 value);
    69         byte File::getbit(byte s);
     69        byte getbit(byte s);
    7070};
    7171
    7272#endif
  • resource.cpp

     
    192192        {"SMRK", "SMUSH Audio Marker", 0, "", 24},
    193193        {"SHDR", "SMUSH Audio Header/SMUSH v2 Header", 0, "", 24},
    194194        {"ETRS", "SMUSH External Text Resource", 0, "", 24},
    195         {0, 0, 0, 0, 0}
     195        {"0", "0", 0, "0", 0}
    196196};
    197197
    198198const struct blockInfo oldBlocksInfo[] = {
     
    226226        {"RN", "Room Names", 0, "", 47},
    227227        {"WA", "", 0, "", 31},
    228228        {"AD", "", 0, "", 31},
    229         {0, 0, 0, 0, 0}
     229        {"0", "0", 0, "0", 0}
    230230};
    231231
    232232
     
    747747                                                _blockTable[i].blockTypeID = getBlockType(tempname);
    748748                                        }
    749749                                }
    750                                 if (_blockTable[i].blockType == "") {
     750                                if (strcmp(_blockTable[i].blockType, "")) {
    751751                                        sprintf(_blockTable[i].blockType, "Unknown");
    752752                                }
    753753                        }
  • icons/xpm_46.xpm

     
    11/* XPM */
    2 static char *xpm_46[] = {
     2static const char *xpm_46[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 3 1",
    55"  c black",
  • icons/xpm_48.xpm

     
    11/* XPM */
    2 static char *xpm_48[] = {
     2static const char *xpm_48[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 43 1",
    55"  c #8C3910",
  • icons/xpm_20_big.xpm

     
    11/* XPM */
    2 static char *xpm_20_big[] = {
     2static const char *xpm_20_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 98 2",
    55"   c black",
  • icons/xpm_21_big.xpm

     
    11/* XPM */
    2 static char *xpm_21_big[] = {
     2static const char *xpm_21_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 119 2",
    55"   c #6B3121",
  • icons/xpm_22_big.xpm

     
    11/* XPM */
    2 static char *xpm_22_big[] = {
     2static const char *xpm_22_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 119 2",
    55"   c #6B3121",
  • icons/xpm_23_big.xpm

     
    11/* XPM */
    2 static char *xpm_23_big[] = {
     2static const char *xpm_23_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 116 2",
    55"   c #000800",
  • icons/xpm_24_big.xpm

     
    11/* XPM */
    2 static char *xpm_24_big[] = {
     2static const char *xpm_24_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 25 1",
    55"  c black",
  • icons/xpm_25_big.xpm

     
    11/* XPM */
    2 static char *xpm_25_big[] = {
     2static const char *xpm_25_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 33 1",
    55"  c #2929CE",
  • icons/xpm_26_big.xpm

     
    11/* XPM */
    2 static char *xpm_26_big[] = {
     2static const char *xpm_26_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 55 1",
    55"  c #002973",
  • icons/xpm_27_big.xpm

     
    11/* XPM */
    2 static char *xpm_27_big[] = {
     2static const char *xpm_27_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 34 1",
    55"  c black",
  • icons/xpm_28_big.xpm

     
    11/* XPM */
    2 static char *xpm_28_big[] = {
     2static const char *xpm_28_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 9 1",
    55"  c #100010",
  • icons/xpm_29_big.xpm

     
    11/* XPM */
    2 static char *xpm_29_big[] = {
     2static const char *xpm_29_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 256 2",
    55"   c #391010",
  • icons/xpm_0_big.xpm

     
    11/* XPM */
    2 static char *xpm_0_big[] = {
     2static const char *xpm_0_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 3 1",
    55"  c black",
  • icons/xpm_10.xpm

     
    11/* XPM */
    2 static char *xpm_10[] = {
     2static const char *xpm_10[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 105 2",
    55"   c #10184A",
  • icons/xpm_1_big.xpm

     
    11/* XPM */
    2 static char *xpm_1_big[] = {
     2static const char *xpm_1_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 39 1",
    55"  c black",
  • icons/xpm_12.xpm

     
    11/* XPM */
    2 static char *xpm_12[] = {
     2static const char *xpm_12[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 98 2",
    55"   c black",
  • icons/xpm_2_big.xpm

     
    11/* XPM */
    2 static char *xpm_2_big[] = {
     2static const char *xpm_2_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 11 1",
    55"  c black",
  • icons/xpm_3_big.xpm

     
    11/* XPM */
    2 static char *xpm_3_big[] = {
     2static const char *xpm_3_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 257 2",
    55"   c #310000",
  • icons/xpm_4_big.xpm

     
    11/* XPM */
    2 static char *xpm_4_big[] = {
     2static const char *xpm_4_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 20 1",
    55"  c gray45",
  • icons/xpm_14.xpm

     
    11/* XPM */
    2 static char *xpm_14[] = {
     2static const char *xpm_14[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 59 1",
    55"  c #291000",
  • icons/xpm_5_big.xpm

     
    11/* XPM */
    2 static char *xpm_5_big[] = {
     2static const char *xpm_5_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 89 1",
    55"  c gray29",
  • icons/xpm_51.xpm

     
    11/* XPM */
    2 static char *xpm_51[] = {
     2static const char *xpm_51[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 55 1",
    55"  c #21737B",
  • icons/xpm_6_big.xpm

     
    11/* XPM */
    2 static char *xpm_6_big[] = {
     2static const char *xpm_6_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 218 2",
    55"   c #181010",
  • icons/xpm_16.xpm

     
    11/* XPM */
    2 static char *xpm_16[] = {
     2static const char *xpm_16[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 26 1",
    55"  c black",
  • icons/xpm_7_big.xpm

     
    11/* XPM */
    2 static char *xpm_7_big[] = {
     2static const char *xpm_7_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 120 2",
    55"   c black",
  • icons/xpm_53.xpm

     
    11/* XPM */
    2 static char *xpm_53[] = {
     2static const char *xpm_53[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 68 1",
    55"  c #101010",
  • icons/xpm_18.xpm

     
    11/* XPM */
    2 static char *xpm_18[] = {
     2static const char *xpm_18[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 53 1",
    55"  c #291000",
  • icons/xpm_8_big.xpm

     
    11/* XPM */
    2 static char *xpm_8_big[] = {
     2static const char *xpm_8_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 14 1",
    55"  c black",
  • icons/xpm_55.xpm

     
    11/* XPM */
    2 static char *xpm_55[] = {
     2static const char *xpm_55[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 45 1",
    55"  c black",
  • icons/xpm_9_big.xpm

     
    11/* XPM */
    2 static char *xpm_9_big[] = {
     2static const char *xpm_9_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 88 1",
    55"  c #291000",
  • icons/xpm_57.xpm

     
    11/* XPM */
    2 static char *xpm_57[] = {
     2static const char *xpm_57[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 58 1",
    55"  c #292900",
  • icons/xpm_59.xpm

     
    11/* XPM */
    2 static char *xpm_59[] = {
     2static const char *xpm_59[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 33 1",
    55"  c black",
  • icons/xpm_30_big.xpm

     
    11/* XPM */
    2 static char *xpm_30_big[] = {
     2static const char *xpm_30_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 257 2",
    55"   c #313100",
  • icons/xpm_31_big.xpm

     
    11/* XPM */
    2 static char *xpm_31_big[] = {
     2static const char *xpm_31_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 41 1",
    55"  c black",
  • icons/xpm_32_big.xpm

     
    11/* XPM */
    2 static char *xpm_32_big[] = {
     2static const char *xpm_32_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 23 1",
    55"  c black",
  • icons/xpm_33_big.xpm

     
    11/* XPM */
    2 static char *xpm_33_big[] = {
     2static const char *xpm_33_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 138 2",
    55"   c black",
  • icons/xpm_34_big.xpm

     
    11/* XPM */
    2 static char *xpm_34_big[] = {
     2static const char *xpm_34_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 150 2",
    55"   c #102118",
  • icons/xpm_35_big.xpm

     
    11/* XPM */
    2 static char *xpm_35_big[] = {
     2static const char *xpm_35_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 129 2",
    55"   c #00187B",
  • icons/xpm_36_big.xpm

     
    11/* XPM */
    2 static char *xpm_36_big[] = {
     2static const char *xpm_36_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 37 1",
    55"  c #002973",
  • icons/xpm_37_big.xpm

     
    11/* XPM */
    2 static char *xpm_37_big[] = {
     2static const char *xpm_37_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 111 2",
    55"   c #633939",
  • icons/xpm_38_big.xpm

     
    11/* XPM */
    2 static char *xpm_38_big[] = {
     2static const char *xpm_38_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 112 2",
    55"   c #6B3121",
  • icons/xpm_39_big.xpm

     
    11/* XPM */
    2 static char *xpm_39_big[] = {
     2static const char *xpm_39_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 71 1",
    55"  c black",
  • icons/xpm_21.xpm

     
    11/* XPM */
    2 static char *xpm_21[] = {
     2static const char *xpm_21[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 78 1",
    55"  c #633129",
  • icons/xpm_23.xpm

     
    11/* XPM */
    2 static char *xpm_23[] = {
     2static const char *xpm_23[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 65 1",
    55"  c #001800",
  • icons/xpm_60.xpm

     
    11/* XPM */
    2 static char *xpm_60[] = {
     2static const char *xpm_60[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 21 1",
    55"  c gray3",
  • icons/xpm_25.xpm

     
    11/* XPM */
    2 static char *xpm_25[] = {
     2static const char *xpm_25[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 32 1",
    55"  c #3139BD",
  • icons/xpm_27.xpm

     
    11/* XPM */
    2 static char *xpm_27[] = {
     2static const char *xpm_27[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 32 1",
    55"  c black",
  • icons/close_icon.xpm

     
    11/* XPM */
    2 static char *close_icon[] = {
     2static const char *close_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 61 1",
    55"  c black",
  • icons/xpm_29.xpm

     
    11/* XPM */
    2 static char *xpm_29[] = {
     2static const char *xpm_29[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 102 2",
    55"   c #296B4A",
  • icons/exit_icon.xpm

     
    11/* XPM */
    2 static char *exit_icon[] = {
     2static const char *exit_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 66 1",
    55"  c black",
  • icons/xpm_1.xpm

     
    11/* XPM */
    2 static char *xpm_1[] = {
     2static const char *xpm_1[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 42 1",
    55"  c black",
  • icons/xpm_3.xpm

     
    11/* XPM */
    2 static char *xpm_3[] = {
     2static const char *xpm_3[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 156 2",
    55"   c #310000",
  • icons/xpm_5.xpm

     
    11/* XPM */
    2 static char *xpm_5[] = {
     2static const char *xpm_5[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 62 1",
    55"  c #73737B",
  • icons/xpm_40_big.xpm

     
    11/* XPM */
    2 static char *xpm_40_big[] = {
     2static const char *xpm_40_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 257 2",
    55"   c black",
  • icons/xpm_41_big.xpm

     
    11/* XPM */
    2 static char *xpm_41_big[] = {
     2static const char *xpm_41_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 78 1",
    55"  c black",
  • icons/xpm_7.xpm

     
    11/* XPM */
    2 static char *xpm_7[] = {
     2static const char *xpm_7[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 65 1",
    55"  c #392118",
  • icons/xpm_42_big.xpm

     
    11/* XPM */
    2 static char *xpm_42_big[] = {
     2static const char *xpm_42_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 58 1",
    55"  c #002173",
  • icons/xpm_43_big.xpm

     
    11/* XPM */
    2 static char *xpm_43_big[] = {
     2static const char *xpm_43_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 72 1",
    55"  c #6B0000",
  • icons/xpm_44_big.xpm

     
    11/* XPM */
    2 static char *xpm_44_big[] = {
     2static const char *xpm_44_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 25 1",
    55"  c #211000",
  • icons/xpm_9.xpm

     
    11/* XPM */
    2 static char *xpm_9[] = {
     2static const char *xpm_9[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 25 1",
    55"  c black",
  • icons/xpm_45_big.xpm

     
    11/* XPM */
    2 static char *xpm_45_big[] = {
     2static const char *xpm_45_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 33 1",
    55"  c black",
  • icons/xpm_46_big.xpm

     
    11/* XPM */
    2 static char *xpm_46_big[] = {
     2static const char *xpm_46_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 3 1",
    55"  c black",
  • icons/xpm_47_big.xpm

     
    11/* XPM */
    2 static char *xpm_47_big[] = {
     2static const char *xpm_47_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 11 1",
    55"  c #8C0000",
  • icons/xpm_48_big.xpm

     
    11/* XPM */
    2 static char *xpm_48_big[] = {
     2static const char *xpm_48_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 55 1",
    55"  c #8C3910",
  • icons/xpm_49_big.xpm

     
    11/* XPM */
    2 static char *xpm_49_big[] = {
     2static const char *xpm_49_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 21 1",
    55"  c black",
  • icons/xpm_30.xpm

     
    11/* XPM */
    2 static char *xpm_30[] = {
     2static const char *xpm_30[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 132 2",
    55"   c #393100",
  • icons/xpm_32.xpm

     
    11/* XPM */
    2 static char *xpm_32[] = {
     2static const char *xpm_32[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 17 1",
    55"  c black",
  • icons/xpm_34.xpm

     
    11/* XPM */
    2 static char *xpm_34[] = {
     2static const char *xpm_34[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 58 1",
    55"  c #003131",
  • icons/xpm_36.xpm

     
    11/* XPM */
    2 static char *xpm_36[] = {
     2static const char *xpm_36[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 39 1",
    55"  c #00187B",
  • icons/xpm_38.xpm

     
    11/* XPM */
    2 static char *xpm_38[] = {
     2static const char *xpm_38[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 70 1",
    55"  c #633129",
  • icons/xpm_50_big.xpm

     
    11/* XPM */
    2 static char *xpm_50_big[] = {
     2static const char *xpm_50_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 156 2",
    55"   c #087300",
  • icons/xpm_51_big.xpm

     
    11/* XPM */
    2 static char *xpm_51_big[] = {
     2static const char *xpm_51_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 31 1",
    55"  c #085A5A",
  • icons/xpm_52_big.xpm

     
    11/* XPM */
    2 static char *xpm_52_big[] = {
     2static const char *xpm_52_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 64 1",
    55"  c black",
  • icons/xpm_53_big.xpm

     
    11/* XPM */
    2 static char *xpm_53_big[] = {
     2static const char *xpm_53_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 141 2",
    55"   c black",
  • icons/xpm_54_big.xpm

     
    11/* XPM */
    2 static char *xpm_54_big[] = {
     2static const char *xpm_54_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 150 2",
    55"   c black",
  • icons/cancel_icon.xpm

     
    11/* XPM */
    2 static char *cancel_icon[] = {
     2static const char *cancel_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 111 2",
    55"   c black",
  • icons/xpm_55_big.xpm

     
    11/* XPM */
    2 static char *xpm_55_big[] = {
     2static const char *xpm_55_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 63 1",
    55"  c black",
  • icons/xpm_56_big.xpm

     
    11/* XPM */
    2 static char *xpm_56_big[] = {
     2static const char *xpm_56_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 144 2",
    55"   c black",
  • icons/xpm_57_big.xpm

     
    11/* XPM */
    2 static char *xpm_57_big[] = {
     2static const char *xpm_57_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 99 2",
    55"   c black",
  • icons/xpm_58_big.xpm

     
    11/* XPM */
    2 static char *xpm_58_big[] = {
     2static const char *xpm_58_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 38 1",
    55"  c black",
  • icons/xpm_59_big.xpm

     
    11/* XPM */
    2 static char *xpm_59_big[] = {
     2static const char *xpm_59_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 58 1",
    55"  c black",
  • icons/xpm_41.xpm

     
    11/* XPM */
    2 static char *xpm_41[] = {
     2static const char *xpm_41[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 43 1",
    55"  c #392118",
  • icons/open_icon.xpm

     
    11/* XPM */
    2 static char *open_icon[] = {
     2static const char *open_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 64 1",
    55"  c black",
  • icons/xpm_43.xpm

     
    11/* XPM */
    2 static char *xpm_43[] = {
     2static const char *xpm_43[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 42 1",
    55"  c #6B0000",
  • icons/xpm_45.xpm

     
    11/* XPM */
    2 static char *xpm_45[] = {
     2static const char *xpm_45[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 8 1",
    55"  c black",
  • icons/xpm_47.xpm

     
    11/* XPM */
    2 static char *xpm_47[] = {
     2static const char *xpm_47[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 11 1",
    55"  c #8C0000",
  • icons/xpm_49.xpm

     
    11/* XPM */
    2 static char *xpm_49[] = {
     2static const char *xpm_49[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 16 1",
    55"  c black",
  • icons/xpm_60_big.xpm

     
    11/* XPM */
    2 static char *xpm_60_big[] = {
     2static const char *xpm_60_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 22 1",
    55"  c black",
  • icons/xpm_11.xpm

     
    11/* XPM */
    2 static char *xpm_11[] = {
     2static const char *xpm_11[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 118 2",
    55"   c #101042",
  • icons/xpm_13.xpm

     
    11/* XPM */
    2 static char *xpm_13[] = {
     2static const char *xpm_13[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 25 1",
    55"  c black",
  • icons/xpm_50.xpm

     
    11/* XPM */
    2 static char *xpm_50[] = {
     2static const char *xpm_50[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 85 1",
    55"  c #187308",
  • icons/xpm_15.xpm

     
    11/* XPM */
    2 static char *xpm_15[] = {
     2static const char *xpm_15[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 52 1",
    55"  c black",
  • icons/xpm_52.xpm

     
    11/* XPM */
    2 static char *xpm_52[] = {
     2static const char *xpm_52[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 48 1",
    55"  c black",
  • icons/xpm_17.xpm

     
    11/* XPM */
    2 static char *xpm_17[] = {
     2static const char *xpm_17[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 45 1",
    55"  c black",
  • icons/xpm_54.xpm

     
    11/* XPM */
    2 static char *xpm_54[] = {
     2static const char *xpm_54[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 75 1",
    55"  c #101010",
  • icons/xpm_19.xpm

     
    11/* XPM */
    2 static char *xpm_19[] = {
     2static const char *xpm_19[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 45 1",
    55"  c #291000",
  • icons/xpm_56.xpm

     
    11/* XPM */
    2 static char *xpm_56[] = {
     2static const char *xpm_56[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 67 1",
    55"  c gray3",
  • icons/xpm_58.xpm

     
    11/* XPM */
    2 static char *xpm_58[] = {
     2static const char *xpm_58[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 55 1",
    55"  c #292900",
  • icons/xpm_20.xpm

     
    11/* XPM */
    2 static char *xpm_20[] = {
     2static const char *xpm_20[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 47 1",
    55"  c #291000",
  • icons/xpm_22.xpm

     
    11/* XPM */
    2 static char *xpm_22[] = {
     2static const char *xpm_22[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 80 1",
    55"  c #633129",
  • icons/xpm_24.xpm

     
    11/* XPM */
    2 static char *xpm_24[] = {
     2static const char *xpm_24[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 23 1",
    55"  c black",
  • icons/xpm_26.xpm

     
    11/* XPM */
    2 static char *xpm_26[] = {
     2static const char *xpm_26[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 50 1",
    55"  c #00187B",
  • icons/xpm_28.xpm

     
    11/* XPM */
    2 static char *xpm_28[] = {
     2static const char *xpm_28[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 64 1",
    55"  c #4A424A",
  • icons/xpm_0.xpm

     
    11/* XPM */
    2 static char *xpm_0[] = {
     2static const char *xpm_0[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 3 1",
    55"  c black",
  • icons/xpm_2.xpm

     
    11/* XPM */
    2 static char *xpm_2[] = {
     2static const char *xpm_2[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 42 1",
    55"  c #7B6B6B",
  • icons/xpm_4.xpm

     
    11/* XPM */
    2 static char *xpm_4[] = {
     2static const char *xpm_4[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 24 1",
    55"  c #181821",
  • icons/xpm_6.xpm

     
    11/* XPM */
    2 static char *xpm_6[] = {
     2static const char *xpm_6[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 77 1",
    55"  c #181010",
  • icons/xpm_8.xpm

     
    11/* XPM */
    2 static char *xpm_8[] = {
     2static const char *xpm_8[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 14 1",
    55"  c black",
  • icons/hex_icon.xpm

     
    11/* XPM */
    2 static char *hex_icon[] = {
     2static const char *hex_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 65 1",
    55"  c black",
  • icons/help_icon.xpm

     
    11/* XPM */
    2 static char *help_icon[] = {
     2static const char *help_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 123 2",
    55"   c black",
  • icons/xpm_31.xpm

     
    11/* XPM */
    2 static char *xpm_31[] = {
     2static const char *xpm_31[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 22 1",
    55"  c black",
  • icons/xpm_33.xpm

     
    11/* XPM */
    2 static char *xpm_33[] = {
     2static const char *xpm_33[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 87 1",
    55"  c #003918",
  • icons/xpm_35.xpm

     
    11/* XPM */
    2 static char *xpm_35[] = {
     2static const char *xpm_35[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 76 1",
    55"  c #00107B",
  • icons/xpm_37.xpm

     
    11/* XPM */
    2 static char *xpm_37[] = {
     2static const char *xpm_37[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 65 1",
    55"  c #7B4A39",
  • icons/xpm_39.xpm

     
    11/* XPM */
    2 static char *xpm_39[] = {
     2static const char *xpm_39[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 37 1",
    55"  c #101018",
  • icons/xpm_10_big.xpm

     
    11/* XPM */
    2 static char *xpm_10_big[] = {
     2static const char *xpm_10_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 185 2",
    55"   c black",
  • icons/xpm_11_big.xpm

     
    11/* XPM */
    2 static char *xpm_11_big[] = {
     2static const char *xpm_11_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 203 2",
    55"   c #080000",
  • icons/xpm_12_big.xpm

     
    11/* XPM */
    2 static char *xpm_12_big[] = {
     2static const char *xpm_12_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 166 2",
    55"   c black",
  • icons/file_icon.xpm

     
    11/* XPM */
    2 static char *file_icon[] = {
     2static const char *file_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 109 2",
    55"   c #000000",
  • icons/xpm_13_big.xpm

     
    11/* XPM */
    2 static char *xpm_13_big[] = {
     2static const char *xpm_13_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 34 1",
    55"  c black",
  • icons/xpm_14_big.xpm

     
    11/* XPM */
    2 static char *xpm_14_big[] = {
     2static const char *xpm_14_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 211 2",
    55"   c #291000",
  • icons/xpm_15_big.xpm

     
    11/* XPM */
    2 static char *xpm_15_big[] = {
     2static const char *xpm_15_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 50 1",
    55"  c black",
  • icons/xpm_16_big.xpm

     
    11/* XPM */
    2 static char *xpm_16_big[] = {
     2static const char *xpm_16_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 41 1",
    55"  c black",
  • icons/xpm_17_big.xpm

     
    11/* XPM */
    2 static char *xpm_17_big[] = {
     2static const char *xpm_17_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 74 1",
    55"  c black",
  • icons/xpm_18_big.xpm

     
    11/* XPM */
    2 static char *xpm_18_big[] = {
     2static const char *xpm_18_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 138 2",
    55"   c #291000",
  • icons/xpm_19_big.xpm

     
    11/* XPM */
    2 static char *xpm_19_big[] = {
     2static const char *xpm_19_big[] = {
    33/* columns rows colors chars-per-pixel */
    44"32 32 110 2",
    55"   c #291000",
  • icons/options_icon.xpm

     
    11/* XPM */
    2 static char *options_icon[] = {
     2static const char *options_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 47 1",
    55"  c black",
  • icons/save_icon.xpm

     
    11/* XPM */
    2 static char *save_icon[] = {
     2static const char *save_icon[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 83 1",
    55"  c black",
  • icons/xpm_40.xpm

     
    11/* XPM */
    2 static char *xpm_40[] = {
     2static const char *xpm_40[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 90 1",
    55"  c black",
  • icons/xpm_42.xpm

     
    11/* XPM */
    2 static char *xpm_42[] = {
     2static const char *xpm_42[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 53 1",
    55"  c #002973",
  • icons/xpm_44.xpm

     
    11/* XPM */
    2 static char *xpm_44[] = {
     2static const char *xpm_44[] = {
    33/* columns rows colors chars-per-pixel */
    44"16 16 16 1",
    55"  c #211000",
  • descumm.cpp

     
    12421242                                        if (i == 255) {
    12431243                                                i = get_byte();
    12441244                                                buf = putascii(buf, i);
    1245                                                 if (i == 0 || i != 2 && i != 3 && i != 8) {
     1245                                                if ( (i == 0) || (i != 2 && i != 3 && i != 8)) {
    12461246                                                        buf = putascii(buf, get_byte());
    12471247                                                        buf = putascii(buf, get_byte());
    12481248                                                }
     
    16471647        case 0xD9:
    16481648        case 0xF9:{
    16491649                        buf = strecpy(buf, "doSentence(");
    1650                         if (!(opcode & 0x80) && (*cur_pos == 0xFB) || *cur_pos == 0xFC) {
     1650                        if ((!(opcode & 0x80) && (*cur_pos == 0xFB)) || *cur_pos == 0xFC) {
    16511651                                strcpy(buf, "STOP)");
    16521652                                cur_pos++;
    16531653                        } else {