ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/video_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/video_amiga.cpp (file contents):
Revision 1.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.3 by cebix, 2000-04-10T18:52:46Z

# Line 1 | Line 1
1   /*
2   *  video_amiga.cpp - Video/graphics emulation, AmigaOS specific stuff
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2000 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 107 | Line 107 | static bool init_window(int width, int h
107                  WA_DragBar, TRUE,
108                  WA_DepthGadget, TRUE,
109                  WA_SizeGadget, FALSE,
110 <                WA_Title, GetString(STR_WINDOW_TITLE),
110 >                WA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
111                  TAG_END
112          );
113          if (the_win == NULL) {
# Line 150 | Line 150 | static bool init_pip(int width, int heig
150                  P96PIP_SourceFormat, RGBFB_R5G5B5,
151                  P96PIP_SourceWidth, width,
152                  P96PIP_SourceHeight, height,
153 <                P96PIP_ErrorCode, &error,
153 >                P96PIP_ErrorCode, (ULONG)&error,
154                  WA_Left, 0, WA_Top, 0,
155                  WA_InnerWidth, width, WA_InnerHeight, height,
156                  WA_SimpleRefresh, TRUE,
# Line 161 | Line 161 | static bool init_pip(int width, int heig
161                  WA_DragBar, TRUE,
162                  WA_DepthGadget, TRUE,
163                  WA_SizeGadget, FALSE,
164 <                WA_Title, GetString(STR_WINDOW_TITLE),
165 <                WA_PubScreenName, "Workbench",
164 >                WA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
165 >                WA_PubScreenName, (ULONG)"Workbench",
166                  TAG_END
167          );
168          if (the_win == NULL || error) {
# Line 171 | Line 171 | static bool init_pip(int width, int heig
171          }
172  
173          // Find bitmap
174 <        p96PIP_GetTags(the_win, P96PIP_SourceBitMap, &the_bitmap, TAG_END);
174 >        p96PIP_GetTags(the_win, P96PIP_SourceBitMap, (ULONG)&the_bitmap, TAG_END);
175  
176          // Set VideoMonitor
177          VideoMonitor.mac_frame_base = p96GetBitMapAttr(the_bitmap, P96BMA_MEMORY);
# Line 231 | Line 231 | static bool init_screen(ULONG mode_id)
231          // Open screen
232          the_screen = p96OpenScreenTags(
233                  P96SA_DisplayID, mode_id,
234 <                P96SA_Title, GetString(STR_WINDOW_TITLE),
234 >                P96SA_Title, (ULONG)GetString(STR_WINDOW_TITLE),
235                  P96SA_Quiet, TRUE,
236                  P96SA_NoMemory, TRUE,
237                  P96SA_NoSprite, TRUE,
# Line 252 | Line 252 | static bool init_screen(ULONG mode_id)
252                  WA_Activate, TRUE,
253                  WA_RMBTrap, TRUE,
254                  WA_ReportMouse, TRUE,
255 <                WA_CustomScreen, the_screen,
255 >                WA_CustomScreen, (ULONG)the_screen,
256                  TAG_END
257          );
258          if (the_win == NULL) {
# Line 314 | Line 314 | bool VideoInit(bool classic)
314  
315          // Start periodic process
316          periodic_proc = CreateNewProcTags(
317 <                NP_Entry, periodic_func,
318 <                NP_Name, "Basilisk II IDCMP Handler",
317 >                NP_Entry, (ULONG)periodic_func,
318 >                NP_Name, (ULONG)"Basilisk II IDCMP Handler",
319                  NP_Priority, 0,
320                  TAG_END
321          );

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines