Skip to content

Commit

Permalink
New folder name for resources
Browse files Browse the repository at this point in the history
the folder for resources has been renamed from images to resources; to avoid the confusion with dsk images.
  • Loading branch information
jmparis committed Feb 6, 2017
1 parent e6b9188 commit 7128ea3
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Frame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ int InitSDL()
SDL_WM_SetIcon(apple_icon, NULL);
printf("Icon was set! Width=%d, height=%d\n", apple_icon->w, apple_icon->h);*/

apple_icon = SDL_LoadBMP("images/icon.bmp");
apple_icon = SDL_LoadBMP("resources/icon.bmp");
if(apple_icon != NULL) {
Uint32 colorkey = SDL_MapRGB(apple_icon->format, 0, 0, 0);
SDL_SetColorKey(apple_icon, SDL_SRCCOLORKEY, colorkey);
Expand Down
1 change: 0 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ $(EXE): Applewin
mv $^ $@
strip $@
@echo " o $(EXE) compiled succesfully"
# cp $@ ../

clean:
rm -f $(EXE) *.o
Expand Down
4 changes: 2 additions & 2 deletions src/Video.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1866,13 +1866,13 @@ void VideoInitialize () {
ZeroMemory(vidlastmem,0x10000);

// LOAD THE splash screen
tmp_surface = SDL_LoadBMP("images/splash.bmp");
tmp_surface = SDL_LoadBMP("resources/splash.bmp");
if (tmp_surface != NULL) g_hLogoBitmap = SDL_DisplayFormat(tmp_surface);
else fprintf(stderr, "Video: splash.bmp was not loaded\n");
SDL_FreeSurface(tmp_surface);

// LOAD APPLE CHARSET40
tmp_surface = SDL_LoadBMP("images/charset40.bmp");
tmp_surface = SDL_LoadBMP("resources/charset40.bmp");
if(tmp_surface != NULL) charset40 = SDL_DisplayFormat(tmp_surface);
else fprintf(stderr, "Video: Apple text is not unavailable: charset40.bmp was not loaded\n");
SDL_FreeSurface(tmp_surface);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/stretch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ SDL_Surface *font_sfc = NULL; // used for font
bool fonts_initialization(void)
{
SDL_Surface *temp_surface;
temp_surface = SDL_LoadBMP("images/font.bmp");
temp_surface = SDL_LoadBMP("resources/font.bmp");
if(!temp_surface) return false;
font_sfc = SDL_DisplayFormat(temp_surface);

Expand Down

0 comments on commit 7128ea3

Please sign in to comment.