[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-commits] master 614df1d: UPDATED GPL headers
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-commits] master 614df1d: UPDATED GPL headers |
|
Date: |
Sat, 20 Aug 2016 13:36:42 +0000 (UTC) |
branch: master
commit 614df1dce1730ec96208f1d44037f1c5b36a1c80
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
UPDATED GPL headers
REMOVED some unused files
---
.gitignore | 2 +-
src/achievements.cc | 2 -
src/achievements.h | 2 -
src/adonthell.cc | 20 +-
src/adonthell.h | 20 +-
src/animation.cc | 27 +-
src/animation.h | 26 +-
src/audio.cc | 24 +-
src/audio.h | 22 +-
src/audio_loop.cc | 334 ------
src/audio_loop.h | 70 --
src/callback.h | 22 +-
src/character.cc | 24 +-
src/character.h | 24 +-
src/character_base.cc | 24 +-
src/character_base.h | 24 +-
src/data_screen.cc | 22 +-
src/data_screen.h | 22 +-
src/dialog.cc | 22 +-
src/dialog.h | 22 +-
src/dialog_screen.cc | 22 +-
src/dialog_screen.h | 22 +-
src/drawable.cc | 19 +-
src/drawable.h | 20 +-
src/drawing_area.cc | 20 +-
src/drawing_area.h | 20 +-
src/effect.cc | 96 --
src/effect.h | 68 --
src/event.cc | 24 +-
src/event.h | 22 +-
src/event_handler.cc | 22 +-
src/event_handler.h | 22 +-
src/event_handler_base.h | 22 +-
src/event_list.cc | 22 +-
src/event_list.h | 22 +-
src/fileops.cc | 22 +-
src/fileops.h | 20 +-
src/game.cc | 24 +-
src/game.h | 24 +-
src/gamedata.cc | 22 +-
src/gamedata.h | 22 +-
src/gamedate.cc | 20 +-
src/gamedate.h | 20 +-
src/gametime.cc | 22 +-
src/gametime.h | 20 +-
src/image.cc | 20 +-
src/image.h | 20 +-
src/input.cc | 30 +-
src/input.h | 24 +-
src/inventory.cc | 294 -----
src/inventory.h | 242 ----
src/item_base.cc | 344 ------
src/item_base.h | 417 -------
src/item_storage.cc | 120 --
src/item_storage.h | 100 --
src/label.cc | 20 +-
src/label.h | 20 +-
src/label_input.cc | 20 +-
src/label_input.h | 19 +-
src/landmap.cc | 20 +-
src/landmap.h | 20 +-
src/lex.prefs.cc | 1910 -------------------------------
src/main.cc | 22 +-
src/manager.cc | 164 ---
src/manager.h | 88 --
src/map_event.cc | 20 +-
src/map_event.h | 20 +-
src/map_event_handler.cc | 20 +-
src/map_event_handler.h | 20 +-
src/mapcharacter.cc | 20 +-
src/mapcharacter.h | 20 +-
src/mapengine.cc | 177 ---
src/mapobject.cc | 20 +-
src/mapobject.h | 20 +-
src/mapsquare.cc | 20 +-
src/mapsquare.h | 20 +-
src/mapsquare_walkable.cc | 20 +-
src/mapsquare_walkable.h | 20 +-
src/mapview.cc | 20 +-
src/mapview.h | 20 +-
src/nls.cc | 24 +-
src/nls.h | 20 +-
src/path.cc | 20 +-
src/path.h | 20 +-
src/pnm.cc | 20 +-
src/pnm.h | 20 +-
src/prefs.cc | 20 +-
src/prefs.h | 20 +-
src/py_callback.cc | 22 +-
src/py_callback.h | 22 +-
src/py_object.cc | 30 +-
src/py_object.h | 26 +-
src/python_class.cc | 22 +-
src/python_class.h | 22 +-
src/quest.cc | 22 +-
src/quest.h | 22 +-
src/screen.cc | 22 +-
src/screen.h | 22 +-
src/slot.cc | 218 ----
src/slot.h | 241 ----
src/storage.cc | 24 +-
src/storage.h | 24 +-
src/str_hash.h | 17 +-
src/surface.cc | 24 +-
src/surface.h | 22 +-
src/text_bubble.cc | 24 +-
src/text_bubble.h | 24 +-
src/time_event.cc | 9 +-
src/time_event.h | 20 +-
src/time_event_handler.cc | 20 +-
src/time_event_handler.h | 20 +-
src/tools/dlgedit/cfg_data.cc | 9 +-
src/tools/dlgedit/cfg_data.h | 9 +-
src/tools/dlgedit/cfg_io.cc | 9 +-
src/tools/dlgedit/cfg_io.h | 9 +-
src/tools/dlgedit/cfg_project.cc | 9 +-
src/tools/dlgedit/cfg_project.h | 9 +-
src/tools/dlgedit/dlg_arrow.cc | 7 +-
src/tools/dlgedit/dlg_arrow.h | 7 +-
src/tools/dlgedit/dlg_circle.cc | 7 +-
src/tools/dlgedit/dlg_circle.h | 7 +-
src/tools/dlgedit/dlg_circle_entry.cc | 9 +-
src/tools/dlgedit/dlg_circle_entry.h | 9 +-
src/tools/dlgedit/dlg_cmdline.cc | 9 +-
src/tools/dlgedit/dlg_cmdline.h | 9 +-
src/tools/dlgedit/dlg_compiler.cc | 7 +-
src/tools/dlgedit/dlg_compiler.h | 9 +-
src/tools/dlgedit/dlg_module.cc | 7 +-
src/tools/dlgedit/dlg_module.h | 9 +-
src/tools/dlgedit/dlg_module_entry.cc | 9 +-
src/tools/dlgedit/dlg_module_entry.h | 2 +-
src/tools/dlgedit/dlg_mover.cc | 9 +-
src/tools/dlgedit/dlg_mover.h | 9 +-
src/tools/dlgedit/dlg_node.cc | 9 +-
src/tools/dlgedit/dlg_node.h | 7 +-
src/tools/dlgedit/dlg_node_gfx.cc | 7 +-
src/tools/dlgedit/dlg_node_gfx.h | 7 +-
src/tools/dlgedit/dlg_point.cc | 9 +-
src/tools/dlgedit/dlg_point.h | 9 +-
src/tools/dlgedit/dlg_rect.cc | 9 +-
src/tools/dlgedit/dlg_rect.h | 9 +-
src/tools/dlgedit/dlg_types.h | 9 +-
src/tools/dlgedit/gui_circle.cc | 7 +-
src/tools/dlgedit/gui_circle.h | 7 +-
src/tools/dlgedit/gui_circle_events.cc | 7 +-
src/tools/dlgedit/gui_circle_events.h | 9 +-
src/tools/dlgedit/gui_code.cc | 7 +-
src/tools/dlgedit/gui_code.h | 9 +-
src/tools/dlgedit/gui_dlgedit.cc | 7 +-
src/tools/dlgedit/gui_dlgedit.h | 9 +-
src/tools/dlgedit/gui_dlgedit_events.cc | 7 +-
src/tools/dlgedit/gui_dlgedit_events.h | 9 +-
src/tools/dlgedit/gui_edit.cc | 7 +-
src/tools/dlgedit/gui_edit.h | 9 +-
src/tools/dlgedit/gui_error.cc | 7 +-
src/tools/dlgedit/gui_error.h | 7 +-
src/tools/dlgedit/gui_file.cc | 15 +-
src/tools/dlgedit/gui_file.h | 9 +-
src/tools/dlgedit/gui_graph.cc | 7 +-
src/tools/dlgedit/gui_graph.h | 9 +-
src/tools/dlgedit/gui_graph_events.cc | 7 +-
src/tools/dlgedit/gui_graph_events.h | 9 +-
src/tools/dlgedit/gui_list.cc | 7 +-
src/tools/dlgedit/gui_list.h | 7 +-
src/tools/dlgedit/gui_list_events.cc | 7 +-
src/tools/dlgedit/gui_list_events.h | 7 +-
src/tools/dlgedit/gui_messages.cc | 7 +-
src/tools/dlgedit/gui_messages.h | 9 +-
src/tools/dlgedit/gui_modal_dialog.cc | 9 +-
src/tools/dlgedit/gui_modal_dialog.h | 9 +-
src/tools/dlgedit/gui_recent_files.cc | 33 +-
src/tools/dlgedit/gui_recent_files.h | 31 +-
src/tools/dlgedit/gui_resources.cc | 7 +-
src/tools/dlgedit/gui_resources.h | 7 +-
src/tools/dlgedit/gui_scrollable.cc | 33 +-
src/tools/dlgedit/gui_scrollable.h | 33 +-
src/tools/dlgedit/gui_settings.cc | 7 +-
src/tools/dlgedit/gui_settings.h | 9 +-
src/tools/dlgedit/gui_tooltip.cc | 7 +-
src/tools/dlgedit/gui_tooltip.h | 9 +-
src/tools/dlgedit/gui_tree.cc | 7 +-
src/tools/dlgedit/gui_tree.h | 7 +-
src/tools/dlgedit/kb_traverse.cc | 9 +-
src/tools/dlgedit/kb_traverse.h | 9 +-
src/tools/dlgedit/loadcfg.l | 20 +-
src/tools/dlgedit/loadlg.l | 20 +-
src/tools/dlgedit/main.cc | 9 +-
src/tools/dlgedit/util.cc | 31 +-
src/tools/dlgedit/util.h | 31 +-
src/types.h | 20 +-
src/win_background.cc | 23 +-
src/win_background.h | 18 +-
src/win_base.cc | 24 +-
src/win_base.h | 22 +-
src/win_border.cc | 20 +-
src/win_border.h | 18 +-
src/win_container.cc | 18 +-
src/win_container.h | 20 +-
src/win_event.cc | 20 +-
src/win_event.h | 20 +-
src/win_font.cc | 19 +-
src/win_font.h | 20 +-
src/win_image.h | 20 +-
src/win_keys.cc | 18 +-
src/win_keys.h | 20 +-
src/win_label.h | 20 +-
src/win_manager.cc | 20 +-
src/win_manager.h | 20 +-
src/win_mapview.h | 20 +-
src/win_object.h | 20 +-
src/win_scroll.cc | 20 +-
src/win_scroll.h | 20 +-
src/win_scrollbar.cc | 22 +-
src/win_scrollbar.h | 18 +-
src/win_select.cc | 20 +-
src/win_select.h | 20 +-
src/win_theme.cc | 20 +-
src/win_theme.h | 20 +-
src/win_ttf.cc | 22 +-
src/win_ttf.h | 24 +-
src/win_types.h | 22 +-
src/win_wrappers.h | 18 +-
src/win_write.h | 20 +-
src/window.h | 18 +
src/yarg.cc | 22 +-
src/yarg.h | 22 +-
226 files changed, 1975 insertions(+), 6440 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1b61c1b..5aeb5b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ remove-potcdate.sed
py_adonthell_wrap.cc
libadonthell.a
adonthell-0.3
-dlgedit
+src/tools/dlgedit/adonthell-dlgedit
html
latex
reference.tag
diff --git a/src/achievements.cc b/src/achievements.cc
index de9fa79..0138db2 100644
--- a/src/achievements.cc
+++ b/src/achievements.cc
@@ -1,6 +1,4 @@
/*
- $Id$
-
Copyright (C) 2016 Kai Sterker <address@hidden>
Part of the Adonthell Project <http://adonthell.nongnu.org>
diff --git a/src/achievements.h b/src/achievements.h
index 042d62c..6be9439 100644
--- a/src/achievements.h
+++ b/src/achievements.h
@@ -1,6 +1,4 @@
/*
- $Id$
-
Copyright (C) 2016 Kai Sterker <address@hidden>
Part of the Adonthell Project <http://adonthell.nongnu.org>
diff --git a/src/adonthell.cc b/src/adonthell.cc
index 9941a22..4ac11d1 100644
--- a/src/adonthell.cc
+++ b/src/adonthell.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/adonthell.h b/src/adonthell.h
index 1b44e9e..2fcdbdc 100644
--- a/src/adonthell.h
+++ b/src/adonthell.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/animation.cc b/src/animation.cc
index 1c3dff7..f618437 100644
--- a/src/animation.cc
+++ b/src/animation.cc
@@ -1,16 +1,19 @@
-// $Id$
-
/*
- Copyright (C) 1999/2000/2001 The Adonthell Project
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
- See the COPYING file for more details.
-
- This file is a part of the Adonthell project.
+ Copyright (C) 1999/2000/2001 The Adonthell Project
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/animation.h b/src/animation.h
index b57f2e3..00dd3d1 100644
--- a/src/animation.h
+++ b/src/animation.h
@@ -1,15 +1,19 @@
-// $Id$
-
/*
- Copyright (C) 1999/2000/2001 Alexandre Courbot.
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ Copyright (C) 1999/2000/2001 Alexandre Courbot.
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/audio.cc b/src/audio.cc
index e9b4058..a85f437 100644
--- a/src/audio.cc
+++ b/src/audio.cc
@@ -1,22 +1,26 @@
/*
- $Id$
-
Copyright (C) 2000 Andrew Henderson <address@hidden>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
#include "audio.h"
// #include "audio_loop.h"
diff --git a/src/audio.h b/src/audio.h
index eb90f41..7c77cd0 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
Copyright (C) 2000 Andrew Henderson <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __AUDIO_H__
#define __AUDIO_H__
-#include <SDL2/SDL_mixer.h>
+#include <SDL_mixer.h>
#include "prefs.h"
#include "py_object.h"
// #include "audio_loop.h"
diff --git a/src/audio_loop.cc b/src/audio_loop.cc
deleted file mode 100644
index fc5918d..0000000
--- a/src/audio_loop.cc
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Code partly taken from libvorbis (vorbisfile.c)
- THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001
- by the XIPHOPHORUS Company http://www.xiph.org/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-#if defined (OGG_MUSIC)
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <SDL2/SDL_mixer.h>
-
-#include "types.h"
-#include "fileops.h"
-#include "audio.h"
-#include "audio_loop.h"
-#include "vorbis/codec.h"
-
-// structure to store our looping point information
-loop_info::loop_info (OggVorbis_File *vf)
-{
- // read stuff from the vorbis comment
- vorbis_comment *vc = ov_comment (vf, -1);
- s_int32 offset = 0;
- char *tmp;
-
- // since adding those information to the file header changes the
- // raw offsets, we have to restore them from the original and the
- // current file size.
- tmp = vorbis_comment_query (vc, "OldHeaderSize", 0);
- if (tmp)
- {
- int new_size = ov_raw_total (vf, -1);
- int old_size = atoi (tmp);
-
- offset = old_size - new_size;
- }
-
- // The PCM position of the page with the loop's start
- tmp = vorbis_comment_query (vc, "StartPagePCM", 0);
- if (tmp) start_page_pcm = atoi (tmp);
- else start_page_pcm = -1;
-
- // The raw position of the page containing the loop's start
- // in the file stream
- tmp = vorbis_comment_query (vc, "StartPageRaw", 0);
- if (tmp) start_page_raw = atoi (tmp) + offset;
- else start_page_raw = 0;
-
- // The actual PCM position of the loop's start
- tmp = vorbis_comment_query (vc, "Start", 0);
- if (tmp) start = atoi (tmp);
- else start = 0;
-
- // The raw position of the loop's end point
- tmp = vorbis_comment_query (vc, "End", 0);
- if (tmp) end = atoi (tmp) + offset;
- else end = ov_raw_total (vf, -1);
-}
-
-#define CHUNKSIZE 4096
-
-extern "C" {
-static long _get_data(OggVorbis_File *vf){
- errno=0;
- if(vf->datasource){
- char *buffer=ogg_sync_buffer(&vf->oy,CHUNKSIZE);
- long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource);
- if(bytes>0)ogg_sync_wrote(&vf->oy,bytes);
- if(bytes==0 && errno)return(-1);
- return(bytes);
- }else
- return(0);
-}
-
-static long _get_next_page(OggVorbis_File *vf,ogg_page *og,int boundary){
- if(boundary>0)boundary+=vf->offset;
- while(1){
- long more;
-
- if(boundary>0 && vf->offset>=boundary)return(OV_FALSE);
- more=ogg_sync_pageseek(&vf->oy,og);
-
- if(more<0){
- /* skipped n bytes */
- vf->offset-=more;
- }else{
- if(more==0){
- /* send more paramedics */
- if(!boundary)return(OV_FALSE);
- {
- long ret=_get_data(vf);
- if(ret==0)return(OV_EOF);
- if(ret<0)return(OV_EREAD);
- }
- }else{
- /* got a page. Return the offset at the page beginning,
- advance the internal offset past the page end */
- long ret=vf->offset;
- vf->offset+=more;
- return(ret);
-
- }
- }
- }
-}
-
-static void _make_decode_ready(OggVorbis_File *vf){
- if(vf->ready_state)return;
- if(vf->seekable){
- vorbis_synthesis_init(&vf->vd,vf->vi+vf->current_link);
- }else{
- vorbis_synthesis_init(&vf->vd,vf->vi);
- }
- vorbis_block_init(&vf->vd,&vf->vb);
- vf->ready_state=1;
- return;
-}
-
-static void _decode_clear(OggVorbis_File *vf){
- ogg_stream_clear(&vf->os);
- vorbis_dsp_clear(&vf->vd);
- vorbis_block_clear(&vf->vb);
- vf->ready_state=0;
-
- vf->bittrack=0.f;
- vf->samptrack=0.f;
-}
-
-static int _process_packet(OggVorbis_File *vf,int readp){
- ogg_page og;
-
- /* handle one packet. Try to fetch it from current stream state */
- /* extract packets from page */
- while(1){
-
- /* process a packet if we can. If the machine isn't loaded,
- neither is a page */
- if(vf->ready_state){
- ogg_packet op;
- int result=ogg_stream_packetout(&vf->os,&op);
- ogg_int64_t granulepos;
-
- if(result==-1)return(OV_HOLE); /* hole in the data. */
- if(result>0){
- /* got a packet. process it */
- granulepos=op.granulepos;
- if(!vorbis_synthesis(&vf->vb,&op)){ /* lazy check for lazy
- header handling. The
- header packets aren't
- audio, so if/when we
- submit them,
- vorbis_synthesis will
- reject them */
-
- /* suck in the synthesis data and track bitrate */
- {
- int oldsamples=vorbis_synthesis_pcmout(&vf->vd,NULL);
- vorbis_synthesis_blockin(&vf->vd,&vf->vb);
- vf->samptrack+=vorbis_synthesis_pcmout(&vf->vd,NULL)-oldsamples;
- vf->bittrack+=op.bytes*8;
- }
-
- /* update the pcm offset. */
- if(granulepos!=-1 && !op.e_o_s){
- int link=(vf->seekable?vf->current_link:0);
- int i,samples;
-
- // printf ("Updating the pcm offset\n");
- /* this packet has a pcm_offset on it (the last packet
- completed on a page carries the offset) After processing
- (above), we know the pcm position of the *last* sample
- ready to be returned. Find the offset of the *first*
-
- As an aside, this trick is inaccurate if we begin
- reading anew right at the last page; the end-of-stream
- granulepos declares the last frame in the stream, and the
- last packet of the last page may be a partial frame.
- So, we need a previous granulepos from an in-sequence page
- to have a reference point. Thus the !op.e_o_s clause
- above */
-
- samples=vorbis_synthesis_pcmout(&vf->vd,NULL);
-
- granulepos-=samples;
- for(i=0;i<link;i++)
- granulepos+=vf->pcmlengths[i];
- vf->pcm_offset=granulepos;
- }
- return(1);
- }
- }
- }
-
- if(!readp)return(0);
- if(_get_next_page(vf,&og,-1)<0)return(OV_EOF); /* eof. leave unitialized */
-
- /* bitrate tracking; add the header's bytes here, the body bytes
- are done by packet above */
- vf->bittrack+=og.header_len*8;
-
- /* has our decoding just traversed a bitstream boundary? */
- if(vf->ready_state){
- if(vf->current_serialno!=ogg_page_serialno(&og)){
- _decode_clear(vf);
- }
- }
-
- /* Do we need to load a new machine before submitting the page? */
- /* This is different in the seekable and non-seekable cases.
-
- In the seekable case, we already have all the header
- information loaded and cached; we just initialize the machine
- with it and continue on our merry way.
-
- In the non-seekable (streaming) case, we'll only be at a
- boundary if we just left the previous logical bitstream and
- we're now nominally at the header of the next bitstream
- */
-
- if(!vf->ready_state){
- int link;
- if(vf->seekable){
- vf->current_serialno=ogg_page_serialno(&og);
-
- /* match the serialno to bitstream section. We use this rather than
- offset positions to avoid problems near logical bitstream
- boundaries */
- for(link=0;link<vf->links;link++)
- if(vf->serialnos[link]==vf->current_serialno)break;
- if(link==vf->links)return(OV_EBADLINK); /* sign of a bogus
- stream. error out,
- leave machine
- uninitialized */
-
- vf->current_link=link;
-
- ogg_stream_init(&vf->os,vf->current_serialno);
- ogg_stream_reset(&vf->os);
-
- }/* else{
- // we're streaming
- // fetch the three header packets, build the info struct
-
- _fetch_headers(vf,vf->vi,vf->vc,&vf->current_serialno,&og);
- vf->current_link++;
- link=0;
- } */ // No streaming in Adonthell
-
- _make_decode_ready(vf);
- }
- ogg_stream_pagein(&vf->os,&og);
- }
-}
-
-static int _seek_in_page (OggVorbis_File *vf, int pos)
-{
- /* discard samples until we reach the desired position. Crossing a
- logical bitstream boundary with abandon is OK. */
- while (vf->pcm_offset < pos)
- {
- float **pcm;
- long target=pos-vf->pcm_offset;
- long samples=vorbis_synthesis_pcmout(&vf->vd,&pcm);
-
- if (samples > target) samples = target;
- vorbis_synthesis_read(&vf->vd,samples);
- vf->pcm_offset+=samples;
-
- //printf ("Current offset %i", vf->pcm_offset);
- //printf (", needed %i, retrieved %i\n", target, samples);
-
- if(samples<target)
- if(_process_packet(vf,1)==0)
- vf->pcm_offset=ov_pcm_total(vf,-1); /* eof */
- }
-
- return 0;
-}
-
-// Callback passed to OggVorbis to read/and loop our background music
-size_t ogg_read_callback (void *ptr, size_t size, size_t nmemb, void
*datasource)
-{
- // get the current position
- size_t cur_pos = ftell ((FILE*) datasource);
- u_int32 end_pos = audio::get_loop_end ();
-
- // check whether we'll reach the looping point with the next read
- if (cur_pos + nmemb > end_pos)
- {
- // In case we do:
- int read = 0;
- int to_read = end_pos - cur_pos;
- OggVorbis_File *vf = audio::get_vorbisfile ();
- nmemb -= to_read;
-
- // read up to the looping point, ...
- read = fread (ptr, size, to_read, (FILE*) datasource);
- // jump back in the stream ...
- vf->pcm_offset = audio::get_start_page_pcm ();
- fseek ((FILE*) datasource, audio::get_start_page_raw (), SEEK_SET);
- _seek_in_page (vf, audio::get_loop_start ());
- // and read the remaining data from there
- read += fread (((char*) ptr)+read, size, nmemb, (FILE*) datasource);
-
- return read;
- }
-
- // otherwise just read the next chunk of data
- return fread (ptr, size, nmemb, (FILE*) datasource);
-}
-
-// Wrapper around fread for to prevent some problems with glibc2.2 based
systems
-size_t fread_wrap (void *ptr, size_t size, size_t nmemb, void *datasource)
-{
- return fread (ptr, size, nmemb, (FILE*) datasource);
-}
-}
-#endif // OGG_MUSIC
-
diff --git a/src/audio_loop.h b/src/audio_loop.h
deleted file mode 100644
index 9b60437..0000000
--- a/src/audio_loop.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-#ifndef __AUDIO_LOOP_H__
-#define __AUDIO_LOOP_H__
-
-#ifdef OGG_MUSIC
-#include "vorbis/vorbisfile.h"
-
-// Class containing the information necessary for looping .ogg files
-class loop_info
-{
-public:
- loop_info (OggVorbis_File *);
-
- s_int32 start_page_pcm;
- u_int32 start_page_raw;
- u_int32 start;
- u_int32 end;
-};
-
-// Callback passed to OggVorbis to read/and loop our background music
-extern "C" size_t ogg_read_callback (void *, size_t, size_t, void*);
-extern "C" size_t fread_wrap (void *, size_t, size_t, void*);
-
-// We've got to access internal SDL_mixer data, so here's it's redefiniton
-// from SDL_mixer/music_ogg.h:
-typedef struct {
- int playing;
- int volume;
- OggVorbis_File vf;
- int section;
- SDL_AudioCVT cvt;
- int len_available;
- Uint8 *snd_available;
-} OGG_music;
-
-// from SDL_mixer/music.c:
-struct _Mix_Music {
- enum {
- MUS_CMD,
- MUS_WAV,
- MUS_MOD,
- MUS_MID,
- MUS_OGG,
- MUS_MP3
- } type;
- union {
- OGG_music *ogg;
- } ogg_data;
- Mix_Fading fading;
- int fade_volume;
- int fade_step;
- int fade_steps;
- int error;
-};
-#endif
-
-#endif // __AUDIO_LOOP_H__
diff --git a/src/callback.h b/src/callback.h
index 98b6ff5..e097559 100644
--- a/src/callback.h
+++ b/src/callback.h
@@ -1,17 +1,21 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
-
- Part of the Adonthell Project http://adonthell.linuxgames.com
Special Thanks to Rich Hickey
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _CALL_BACK_H_
diff --git a/src/character.cc b/src/character.cc
index 09a4836..bf48f62 100644
--- a/src/character.cc
+++ b/src/character.cc
@@ -1,21 +1,25 @@
/*
- $Id$
-
- Copyright (C) 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file character.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the character class.
*
diff --git a/src/character.h b/src/character.h
index 0acbf76..4f2ec69 100644
--- a/src/character.h
+++ b/src/character.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
- Copyright (C) 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file character.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the character class.
*
diff --git a/src/character_base.cc b/src/character_base.cc
index 2c82906..0db2cc3 100644
--- a/src/character_base.cc
+++ b/src/character_base.cc
@@ -1,21 +1,25 @@
/*
- $Id$
-
- Copyright (C) 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file character_base.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the character_base class.
*
diff --git a/src/character_base.h b/src/character_base.h
index db3896c..f35378c 100644
--- a/src/character_base.h
+++ b/src/character_base.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
- Copyright (C) 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file character_base.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the character_base class.
*
diff --git a/src/data_screen.cc b/src/data_screen.cc
index 2f919f5..cbd99fd 100644
--- a/src/data_screen.cc
+++ b/src/data_screen.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001/2002 by Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 by Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file data_screen.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the data_screen class.
*
diff --git a/src/data_screen.h b/src/data_screen.h
index efea982..4796b4a 100644
--- a/src/data_screen.h
+++ b/src/data_screen.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001 by Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001 by Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file data_screen.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the data_screen class.
*
diff --git a/src/dialog.cc b/src/dialog.cc
index 04c0ce4..7d8ed95 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -1,20 +1,24 @@
/*
- $Id$
+ (C) Copyright 2000/2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- (C) Copyright 2000/2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file dialog.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the dialog class.
*
diff --git a/src/dialog.h b/src/dialog.h
index 6f6eb5d..9d5bf03 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ (C) Copyright 2000/2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- (C) Copyright 2000/2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DIALOG_H__
@@ -18,7 +22,7 @@
/**
* @file dialog.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the dialog class.
*
diff --git a/src/dialog_screen.cc b/src/dialog_screen.cc
index 9180df0..db7d7ff 100644
--- a/src/dialog_screen.cc
+++ b/src/dialog_screen.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ (C) Copyright 2000/2001/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- (C) Copyright 2000/2001/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file dialog_screen.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the dialog_screen class.
*
diff --git a/src/dialog_screen.h b/src/dialog_screen.h
index 324f229..35ec64b 100644
--- a/src/dialog_screen.h
+++ b/src/dialog_screen.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ (C) Copyright 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- (C) Copyright 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file dialog_screen.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the dialog_screen class.
*
diff --git a/src/drawable.cc b/src/drawable.cc
index b879d05..10ae74b 100644
--- a/src/drawable.cc
+++ b/src/drawable.cc
@@ -1,14 +1,19 @@
-// $Id$
/*
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/drawable.h b/src/drawable.h
index 94726c0..04fff29 100644
--- a/src/drawable.h
+++ b/src/drawable.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/drawing_area.cc b/src/drawing_area.cc
index 21f00c1..a6d36e3 100644
--- a/src/drawing_area.cc
+++ b/src/drawing_area.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 The Adonthell Project
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/drawing_area.h b/src/drawing_area.h
index 31dde9b..7ffc599 100644
--- a/src/drawing_area.h
+++ b/src/drawing_area.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 The Adonthell Project
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/effect.cc b/src/effect.cc
deleted file mode 100644
index 28e3273..0000000
--- a/src/effect.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-
- effect.h is the definition for the effect class
- effect.cc is the implementation for this class
- effect.txt is the documentation for this class
-*/
-
-#include "effect.h"
-
-
-// CONSTRUCTORS AND DESTRUCTORS
-// =======================================================================
-
-effect::effect() // default constructor
-{
- debug_mode = false;
- setName( "" );
-}
-
-// "full" constructor
-// "sparse" constructor
-
-effect::effect( const string fn ) // from file constructor
-{
-}
-
-
-// =======================================================================
-
-
-// OVERLOADED OPERATORS
-// =======================================================================
-
-
-effect effect::operator=( const effect& ef )
-{
- debug_mode = false;
- if( *this != ef )
- {
- setName( ef.getName() );
- }
- return *this;
-}
-
-bool effect::operator==( const effect& ef ) const
-{
- if( getName() == ef.getName() )
- return true;
- else
- return false;
-}
-
-bool effect::operator!=( const effect& ef ) const
-{
- if( !( *this == ef ) )
- return true;
- else
- return false;
-}
-
-// =======================================================================
-
-
-// OVERLOADED CONSTRUCTORS
-// =======================================================================
-
-bool effect::debug( bool val = true ) // turns debug on or off
-{
- debug_mode = val;
- return true;
-}
-
-string effect::getName() const // returns name
-{
- if( debug_mode )
- cout << "getName(): name is '" << name << "'\n";
- return name;
-}
-
-bool effect::setName( const string val ) // sets name
-{
- if( debug_mode )
- cout << "setName(): name set to '" << val << "'\n";
- name = val;
- return true;
-}
-
-// =======================================================================
diff --git a/src/effect.h b/src/effect.h
deleted file mode 100644
index 0c4b9bb..0000000
--- a/src/effect.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-
- effect.h is the definition for the effect class
- effect.cc is the implementation for this class
- effect.txt is the documentation for this class
-*/
-
-#ifndef _EFFECT_H_
-#define _EFFECT_H_
-
-#include <fstream>
-#include <string>
-
-class effect
-{
- public:
-
- // CONSTRUCTORS AND DESTRUCTORS
- // =======================================================================
-
- effect(); // default constructor
- // "full" constructor
- // "sparse" constructor
- effect( const string fn ); // from file constructor
-
- // =======================================================================
-
-
- // OVERLOADED OPERATORS
- // =======================================================================
-
- effect operator=( const effect& ef ); // overloaded = operator
- bool operator==( const effect& ef ) const; // overloaded == operator
- bool operator!=( const effect& ef ) const; // overloaded != operator
-
- // =======================================================================
-
-
- // PUBLIC FUNCTIONS
- // =======================================================================
-
- bool debug( bool val = true ); // turns debug on or off
- string getName() const; // returns name
- bool setName( const string val ); // sets name
-
- // =======================================================================
-
- protected:
-
- // PUBLIC FUNCTIONS
- // =======================================================================
-
- bool debug_mode; // is debug mode on or off?
- string name; // name
-
- // =======================================================================
-
-};
-
-#endif
diff --git a/src/event.cc b/src/event.cc
index be3b17b..1112d0e 100644
--- a/src/event.cc
+++ b/src/event.cc
@@ -1,20 +1,24 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the base event class.
*/
@@ -173,7 +177,7 @@ void event::put_state (ogzstream & file) const
// load the state of the script associated with the event
bool event::get_state (igzstream & file)
{
- // Note that �Type� is already read by event_list::load to
+ // Note that �Type� is already read by event_list::load to
// determine what event subclass to instanciate
// Id << file;
Repeat << file;
diff --git a/src/event.h b/src/event.h
index 4d88a21..e58bf5c 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,20 +1,24 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the %event class.
*
diff --git a/src/event_handler.cc b/src/event_handler.cc
index 8eed9a6..553cb16 100644
--- a/src/event_handler.cc
+++ b/src/event_handler.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event_handler.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Implements the event_handler class.
*
diff --git a/src/event_handler.h b/src/event_handler.h
index 77db49a..2864e5b 100644
--- a/src/event_handler.h
+++ b/src/event_handler.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event_handler.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the event_handler class
*
diff --git a/src/event_handler_base.h b/src/event_handler_base.h
index d1e324d..d96bfcf 100644
--- a/src/event_handler_base.h
+++ b/src/event_handler_base.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event_handler_base.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the base class for event handlers.
*
diff --git a/src/event_list.cc b/src/event_list.cc
index e94de60..1356dc6 100644
--- a/src/event_list.cc
+++ b/src/event_list.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event_list.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Implements the event_list class.
*
diff --git a/src/event_list.h b/src/event_list.h
index bbc8abe..d42a5ee 100644
--- a/src/event_list.h
+++ b/src/event_list.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file event_list.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the event_list class.
*
diff --git a/src/fileops.cc b/src/fileops.cc
index 8db5ae9..f6035b4 100644
--- a/src/fileops.cc
+++ b/src/fileops.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2002/2003 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -24,7 +28,7 @@
#include <stdio.h>
#include <iostream>
-#include <SDL2/SDL_endian.h>
+#include <SDL_endian.h>
#include "fileops.h"
diff --git a/src/fileops.h b/src/fileops.h
index bb61bf7..bdeb529 100644
--- a/src/fileops.h
+++ b/src/fileops.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001/2003 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/game.cc b/src/game.cc
index a772b4e..6a7b7d9 100644
--- a/src/game.cc
+++ b/src/game.cc
@@ -1,21 +1,25 @@
/*
- $Id$
-
- Copyright (C) 1999/2000/2001/2002 Kai Sterker <address@hidden>
+ Copyright (C) 1999/2000/2001/2002 Kai Sterker <address@hidden>
Copyright (C) 2002 Alexandre Courbot <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file game.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
* @author Alexandre Courbot <address@hidden>
*
* @brief Defines the game class.
diff --git a/src/game.h b/src/game.h
index 1410b87..e3af61c 100644
--- a/src/game.h
+++ b/src/game.h
@@ -1,22 +1,26 @@
/*
- $Id$
-
- Copyright (C) 1999/2000/2001 Kai Sterker <address@hidden>
+ Copyright (C) 1999/2000/2001 Kai Sterker <address@hidden>
Copyright (C) 2002 Alexandre Courbot <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file game.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
* @author Alexandre Courbot <address@hidden>
*
* @brief Declares the game class.
diff --git a/src/gamedata.cc b/src/gamedata.cc
index 5fe2d65..5023e3d 100644
--- a/src/gamedata.cc
+++ b/src/gamedata.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001/2002 by Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 by Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file gamedata.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the gamedata and data classes.
*
diff --git a/src/gamedata.h b/src/gamedata.h
index 97f90d8..94c8a95 100644
--- a/src/gamedata.h
+++ b/src/gamedata.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001/2002 by Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 by Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file gamedata.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the gamedata and data classes.
*
diff --git a/src/gamedate.cc b/src/gamedate.cc
index be12353..3405a65 100644
--- a/src/gamedate.cc
+++ b/src/gamedate.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/gamedate.h b/src/gamedate.h
index 417b286..473b643 100644
--- a/src/gamedate.h
+++ b/src/gamedate.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/gametime.cc b/src/gametime.cc
index 7b0cca6..ea1acb0 100644
--- a/src/gametime.cc
+++ b/src/gametime.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@@ -20,7 +24,7 @@
*/
#include "gametime.h"
-#include <SDL2/SDL.h>
+#include <SDL.h>
double gametime::Minute;
u_int32 gametime::timer1;
diff --git a/src/gametime.h b/src/gametime.h
index 3d43b25..750ccdb 100644
--- a/src/gametime.h
+++ b/src/gametime.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/image.cc b/src/image.cc
index d69afb8..57187be 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2002/2004 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/image.h b/src/image.h
index 30c0922..c6d7891 100644
--- a/src/image.h
+++ b/src/image.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2004 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/input.cc b/src/input.cc
index aba0520..7dc44fa 100644
--- a/src/input.cc
+++ b/src/input.cc
@@ -1,21 +1,27 @@
/*
- $Id$
-
- Copyright (C) 1999/2000/2001 Alexandre Courbot.
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ Copyright (C) 1999/2000/2001 Alexandre Courbot.
+ Copyright (C) 2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file input.cc
* @author Alexandre Courbot <address@hidden>
+ * @author Kai Sterker
*
* @brief Defines the input class.
*
@@ -27,7 +33,7 @@
#include <cstdio>
#include <cstdlib>
#include <string.h>
-#include <SDL2/SDL.h>
+#include <SDL.h>
#include "input.h"
u_int8 * input::keystate=NULL;
diff --git a/src/input.h b/src/input.h
index d37a468..fa51420 100644
--- a/src/input.h
+++ b/src/input.h
@@ -1,21 +1,27 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot.
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file input.h
* @author Alexandre Courbot <address@hidden>
+ * @author Kai Sterker
*
* @brief Declares the input class.
*
@@ -30,7 +36,7 @@
#include "types.h"
#include <string>
#include <queue>
-#include <SDL2/SDL_keycode.h>
+#include <SDL_keycode.h>
/**
* Handles keyboard and mouse input.
diff --git a/src/inventory.cc b/src/inventory.cc
deleted file mode 100644
index 8f3ef46..0000000
--- a/src/inventory.cc
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file inventory.cc
- * @author Kai Sterker <address@hidden>
- *
- * @brief Container for items.
- */
-
-#include "inventory.h"
-#include "item_base.h"
-
-// ctor
-inventory::inventory (const u_int16 & size, const bool & limited,
character_base *owner)
-{
- QueryType = 0;
- QueryKey = "";
- Limited = limited;
- Owner = owner;
- grow (size);
-}
-
-// dtor
-inventory::~inventory ()
-{
- std::vector<slot*>::iterator i;
-
- // delete all slots
- for (i = Slots.begin (); i != Slots.end (); i++)
- delete (*i);
-
- Slots.clear ();
-}
-
-// grow inventory
-void inventory::grow (const u_int16 & count)
-{
- for (u_int16 i = 0; i < count; i++)
- Slots.push_back (new slot (this));
-}
-
-// add named slot to inventory
-void inventory::add_slot (const std::string & id, const bool & equipment)
-{
- Slots.push_back (new slot (this, id, equipment));
-}
-
-// retrieve named slot from inventory
-slot *inventory::get_slot (const std::string & id)
-{
- std::vector<slot*>::iterator i;
-
- for (i = Slots.begin (); i != Slots.end (); i++)
- if ((*i)->id () == id) return *i;
-
- return NULL;
-}
-
-// start iteration
-slot *inventory::first ()
-{
- if (Slots.empty ()) return NULL;
-
- I = Slots.begin ();
- return *I;
-}
-
-// continue iteration
-slot *inventory::next ()
-{
- if ((++I) == Slots.end ()) return NULL;
- else return *I;
-}
-
-// insert item(s)
-u_int32 inventory::add (item_base *item, const u_int32 & count)
-{
- // nothing to do
- if (count == 0) return 0;
-
- std::vector<slot*>::iterator i;
- s_int32 remaining = count;
-
- // if item stackable, look for matching stack
- if (item->max_stack () > 1)
- {
- for (i = Slots.begin (); i != Slots.end (); i++)
- if ((*i)->count () > 0 && (*i)->accepts (item))
- {
- remaining = (*i)->add (item, remaining);
- if (remaining == 0) return 0;
- }
- }
-
- // add item(s) to empty slot(s)
- for (i = Slots.begin (); i != Slots.end (); i++)
- if ((*i)->count () == 0)
- {
- remaining = (*i)->add (item, remaining);
- if (remaining == 0) return 0;
- }
-
- // if there are still items left, grow inventory if allowed
- if (remaining && !Limited)
- {
- slot *s;
-
- while (remaining)
- {
- s = new slot (this);
- remaining = s->add (item, remaining);
- Slots.push_back (s);
- }
- }
-
- // return how many items didn't fit
- return remaining;
-}
-
-// combine two (stacks of) items
-bool inventory::combine (slot *target, slot *agent)
-{
- slot *tmp = new slot (NULL);
- u_int32 count = 0;
- item_base *result, *item;
-
- // combine agent with all items in target slot
- while (target->count () > 0 && agent->count () > 0)
- {
- // get result of combination
- item = target->get_item ();
- result = item->combine (agent->get_item ());
-
- // combination successful?
- if (!result)
- {
- // if it wasn't the first try, we screwed up
- if (count > 0)
- {
- fprintf (stderr, "*** error:: inventory::combine: not all
items could be combined!\n");
-
- // try to recover already created items
- break;
- }
-
- // otherwise we can happily tell that the items weren't combinable
- delete tmp;
- return false;
- }
-
- // if new item was created, destroy old one
- if (item != result) item->destroy ();
-
- // this shouldn't fail if items are designed properly
- if (tmp->add (result) != 0)
- {
- fprintf (stderr, "*** error: inventory::combine: result not
fitting into temporary slot!\n");
-
- // cleanup
- result->destroy ();
- break;
- }
-
- count++;
- }
-
- // if target slot is empty, add resulting items to target slot
- if (target->count () == 0) target->add (tmp->get_item (), count);
-
- // otherwise add result to a free slot (or existing stack)
- else add (tmp->get_item (), count);
-
- // do items remain in temporary slot? (this is not supposed to happen)
- if (tmp->count () != 0)
- {
- // FIXME: place remaining items on the ground
- // for now just utter warning
- fprintf (stderr, "*** warning: inventory::combine: %i newly created
items do not fit\n", tmp->count ());
- }
-
- // cleanup
- delete tmp;
-
- return true;
-}
-
-// find first matching item
-item_base *inventory::find (const string & key, const u_int8 & match)
-{
- // init query
- QueryKey = key;
- QueryType = match;
- I = Slots.begin ();
-
- // actually start searching
- return find_next ();
-}
-
-// find more matching items
-item_base *inventory::find_next ()
-{
- item_base *item;
-
- for (; I != Slots.end (); I++)
- {
- // get item from slot
- if ((*I)->count () > 0) item = (*I)->get_item ();
- else continue;
-
- // compare
- switch (QueryType)
- {
- // match name
- case inventory::MATCH_NAME:
- if (item->name () == QueryKey) return item;
- else break;
-
- // match category
- case inventory::MATCH_CATEGORY:
- if (item->is_a (QueryKey)) return item;
- else break;
-
- // wrong query type
- default: return NULL;
- }
- }
-
- // reached end of inventory
- return NULL;
-}
-
-// save inventory
-bool inventory::put_state (ogzstream & file)
-{
- std::vector<slot*>::iterator i;
-
- // save attributes
- Limited >> file;
-
- // save contents
- for (i = Slots.begin (); i != Slots.end (); i++)
- {
- // in case of unlimited inventory, don't bother with saving empty slots
- if (!Limited && (*i)->count () == 0) continue;
-
- true >> file;
- (*i)->put_state (file);
- }
-
- // no more slots
- false >> file;
-
- return true;
-}
-
-// load inventory
-bool inventory::get_state (igzstream & file)
-{
- bool more;
- slot *s;
-
- // load attributs
- Limited << file;
-
- // load contents
- more << file;
-
- while (more)
- {
- // load slot
- s = new slot (this);
- s->get_state (file);
-
- // add slot to inventory
- Slots.push_back (s);
-
- more << file;
- }
-
- return true;
-}
diff --git a/src/inventory.h b/src/inventory.h
deleted file mode 100644
index 6314ccc..0000000
--- a/src/inventory.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file inventory.h
- * @author Kai Sterker <address@hidden>
- *
- * @brief Container for items.
- */
-
-#ifndef INVENTORY_H
-#define INVENTORY_H
-
-#include <vector>
-#include "slot.h"
-
-class character_base;
-
-/**
- * Whenever items need to be stored by an object -- be it %character,
- * chest, shop or %map -- an %inventory should be used. Inventories are
- * more than a list of items. They allow combining and using of items
- * (if the items involved provide this functionality), take care of
- * passing items between inventories and provide means to query for
- * items with certain properties.
- */
-class inventory
-{
-public:
- /**
- * Create an %inventory with 'count' anonymous slots.
- * @param size Initial size of the %inventory.
- * @param limited Whether %inventory has fixed size or not.
- */
- inventory (const u_int16 & size = 0, const bool & limited = true,
- character_base *owner = NULL);
-
- /**
- * Destroy inventory and its contents.
- */
- ~inventory ();
-
- /**
- * @name Slot Handling
- */
- //@{
- /**
- * Adds 'count' anonymous slots to the %inventory, thus increasing its
- * size.
- * @param count Number of slots to add.
- */
- void grow (const u_int16 & count);
-
- /**
- * Add a %slot with the given id. The id should be unique, otherwise
- * you might have troubles in retrieving the %slot with the given id.
- * The size of the %inventory will grow by one.
- * @param id Id of the %slot to add.
- * @param equipment Whether the slot is suitable for equipping items
- */
- void add_slot (const string & id, const bool & equipment = false);
-
- /**
- * Retrieve the %slot with given id from the %inventory.
- * @param id Id of the %slot to retrieve.
- * @return %slot with the given id, or \c NULL if no matching %slot exists.
- */
- slot *get_slot (const string & id);
- //@}
-
- /**
- * @name Inventory iterators
- */
- //@{
- /**
- * Retrieves the first %slot of the %inventory. All subsequent slots
- * can be retrieved via inventory::next ().
- * @return inventories first %slot, or \c NULL if there are no slots.
- */
- slot *first ();
-
- /**
- * After a call to inventory::first (), subsequent calls to this
- * method will return all slots of this %inventory, one by one.
- * Mainly useful for a GUI to display the inventories contents.
- * @return the next slot, or \c NULL if there are no more slots.
- */
- slot *next ();
- //@}
-
- /**
- * @name Item handling
- */
- //@{
- /**
- * Add item(s) to the %inventory. This method should be used when
- * the given items should not be added to a specific %slot, but to
- * this %inventory in general. It then tries to add them in the best
- * possible way: if the item(s) are stackable, they will be added to
- * an already existing stack. Otherwise they will go into the first
- * empty %slot. If not all items fitted, the number of the remaining
- * items will be returned.
- *
- * Note that there is no explicit remove method, as item removal will
- * happen automatically.
- *
- * @param item The item(s) to add.
- * @param count The number of items in the stack.
- * @return the number of items that did not fit.
- */
- u_int32 add (item_base *item, const u_int32 & count = 1);
-
- /**
- * Combine item(s) in the target %slot with the item(s) from the
- * agent %slot. The combination's outcome will depend on the items
- * involved. The target may be changed or transformed into a totally
- * different item. The agent could remain unchanged or even be
- * destroyed in the process. If no combination for target and agent
- * is defined, nothing will happen.
- *
- * Note that target and agent need not be from the same inventory.
- * The items resulting from the combination will always be added
- * to this inventory (which should be that of the target).
- *
- * @param target %Slot containing the target items.
- * @param agent %Slot containing the items to combine with target.
- * @return \b true if combination succeeded, \b false otherwise.
- */
- bool combine (slot *target, slot *agent);
- //@}
-
- /**
- * @name Query Methods
- */
- //@{
- /**
- * Values representing the different query types. It is possible
- * to find items either by their name or by their category.
- */
- enum
- {
- MATCH_NAME = 1,
- MATCH_CATEGORY = 2
- };
-
- /**
- * Find the first item that matches key. Depending on the
- * match parameter, items are either retrieved by name or by
- * category.
- * @param key The key that items must match.
- * @param match The type of query being performed.
- * @return First item matching key, or \c NULL if no match found.
- */
- item_base *find (const string & key, const u_int8 & match);
-
- /**
- * Continue a query started by inventory::find. This will return
- * subsequent items matching the parameters used by the last query.
- * Note that this will not retrieve items in the same stack as the
- * one returned by inventory::find. That is, only the first item
- * of each matching stack is retrieved.
- * @return More matching items, or \c NULL if no more match found.
- */
- item_base *find_next ();
- //@}
-
- /**
- * @name Loading/Saving
- */
- //@{
- /**
- * Load %inventory (and its contents) from stream.
- * @param file stream to load %invnetory from.
- * @return \b true if loading successful, \b false otherwise.
- */
- bool get_state (igzstream & file);
-
- /**
- * Save %inventory (and contents) to a stream.
- * @param file stream to save %inventory to.
- * @return \b true if saving successful, \b false otherwise.
- */
- bool put_state (ogzstream & file);
- //@}
-
- /**
- * Retrieve the %character to whom this inventory belongs.
- * @return Owner of the inventory, or \c NULL if nobody owns it.
- */
- character_base *owner () const
- {
- return Owner;
- }
-
-private:
-#ifndef SWIG
- /**
- * The slots this inventory provides.
- */
- std::vector<slot*> Slots;
-
- /**
- * Inventory iterator.
- */
- std::vector<slot*>::iterator I;
-
- /**
- * Whether this inventory provides unlimited space or not. Inventories
- * with unlimited space will automatically grow as items are added.
- */
- bool Limited;
-
- /**
- * Key of last query.
- */
- string QueryKey;
-
- /**
- * Type of last query.
- */
- u_int8 QueryType;
-
- /**
- * Character to whom this inventory is assigned.
- */
- character_base *Owner;
-#endif // SWIG
-};
-
-#endif // INVENTORY_H
diff --git a/src/item_base.cc b/src/item_base.cc
deleted file mode 100644
index e49bc3d..0000000
--- a/src/item_base.cc
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file item_base.cc
- * @author Kai Sterker <address@hidden>
- *
- * @brief Superclass for all items.
- */
-
-#include <stdio.h>
-#include <iostream>
-#include <algorithm>
-#include "item_base.h"
-#include "character_base.h"
-
-struct swig_type_info;
-extern "C" {
- swig_type_info *SWIG_Python_TypeQuery (const char*);
- int SWIG_Python_ConvertPtr (PyObject*, void**, swig_type_info*, int);
-}
-
-// ctor
-item_base::item_base (const std::string & item) : py_object ()
-{
- Slot = NULL;
-
- get_state (item);
-}
-
-// dtor
-item_base::~item_base ()
-{
- if (Mutable)
- {
- // if the item is still inside an inventory, remove it
- if (Slot) Slot->remove (this);
-
- // if we have a stack of items, delete the whole stack
- if (Next) delete Next;
- }
-
- py_object::clear ();
-}
-
-// can the given character equip this item?
-bool item_base::can_equip (character_base *character)
-{
- // no
- if (!has_attribute ("equipped")) return false;
-
- int result = 0;
-
- // pass character
- PyObject *args = PyTuple_New (1);
- PyTuple_SetItem (args, 0, python::pass_instance (character,
"character_base"));
-
- // call method
- PyObject *retval = call_method_ret ("can_equip", args);
-
- // if we have valid retval retrieve it
- if (PyInt_Check (retval)) result = PyInt_AS_LONG (retval);
-
- // cleanzp
- Py_XDECREF (retval);
- Py_DECREF (args);
-
- return (result != 0);
-}
-
-// tell item it has been equipped
-void item_base::equipped (slot *target)
-{
- // no effect
- if (!has_attribute ("equipped")) return;
-
- if (!Mutable) Slot = target;
-
- // call method
- call_method ("equipped");
-
- if (!Mutable) Slot = NULL;
-}
-
-// tell item it has been removed
-void item_base::unequipped (slot *target)
-{
- // no effect
- if (!has_attribute ("unequipped")) return;
-
- if (!Mutable) Slot = target;
-
- // call method
- call_method ("unequipped");
-
- if (!Mutable) Slot = NULL;
-}
-
-// trigger item's main functionality
-bool item_base::use (character_base *character)
-{
- // can't be used
- if (!has_attribute ("use")) return false;
-
- int result = 1;
-
- // pass character
- PyObject *args = PyTuple_New (1);
- PyTuple_SetItem (args, 0, python::pass_instance (character,
"character_base"));
-
- // call method
- PyObject *retval = call_method_ret ("use", args);
-
- // if we have valid retval retrieve it
- if (PyInt_Check (retval)) result = PyInt_AS_LONG (retval);
-
- // cleanzp
- Py_XDECREF (retval);
- Py_DECREF (args);
-
- return (result != 0);
-}
-
-// combine two items
-item_base *item_base::combine (item_base *item)
-{
- // can't be combined
- if (!has_attribute ("combine")) return NULL;
-
- item_base *result = NULL;
-
- // pass item
- PyObject *args = PyTuple_New (1);
- PyTuple_SetItem (args, 0, python::pass_instance (item, "item_base"));
-
- // call method
- PyObject *retval = call_method_ret ("combine", args);
-
- // try to retrieve result
- SWIG_Python_ConvertPtr (retval, (void **) &result,
- SWIG_Python_TypeQuery ("_p_item_base"), 1);
-
- // cleanzp
- Py_XDECREF (retval);
- Py_DECREF (args);
-
- return result;
-}
-
-// save a single item to file
-bool item_base::put_state (const std::string & file) const
-{
- ogzstream out (file);
-
- // has file been opened?
- if (!out.is_open ())
- {
- fprintf (stderr, "*** item_base::put_state: cannot write '%s'\n",
file.c_str ());
- return false;
- }
-
- return put_state (out);
-}
-
-// save item to stream
-bool item_base::put_state (ogzstream & file) const
-{
- // do we have a valid item?
- if (!Instance) return false;
-
- // save the attributes
- Mutable >> file;
- MaxStack >> file;
-
- // save the template this item uses
- class_name () >> file;
-
- // pass file
- PyObject *args = PyTuple_New (1);
- PyTuple_SetItem (args, 0, python::pass_instance (&file, "ogzstream"));
-
- // save the actual item data
- call_method ("put_state", args);
- Py_DECREF (args);
-
- // recursively save stack
- if (this->Next)
- {
- true >> file;
- Next->put_state (file);
- }
- else false >> file;
-
- return true;
-}
-
-// load a single item from file
-bool item_base::get_state (const std::string & file)
-{
- igzstream in (file);
-
- // has file been opened?
- if (!in.is_open ())
- {
- fprintf (stderr, "*** item_base::get_state: cannot read '%s'\n",
file.c_str ());
- return false;
- }
-
- // load item
- return get_state (in);
-}
-
-// load item from stream
-bool item_base::get_state (igzstream & file)
-{
- std::string tmpl;
- bool more;
-
- // clean up, if neccessary
- if (Instance) clear ();
-
- // get attributes
- Mutable << file;
- MaxStack << file;
-
- // get template to use for item
- tmpl << file;
-
- // instanciate
- if (!create_instance (ITEM_PACKAGE + tmpl, tmpl)) return false;
-
- // pass file
- PyObject *args = PyTuple_New (1);
- PyTuple_SetItem (args, 0, python::pass_instance (&file, "igzstream"));
-
- // load actual item data
- call_method ("get_state", args);
- Py_DECREF (args);
-
- // add reference to item_base
- set_attribute ("this", python::pass_instance (this, "item_base"));
-
- // recursively get stack
- more << file;
-
- if (more)
- {
- Next = new item_base (true);
- Next->get_state (file);
- }
- else Next = NULL;
-
- return true;
-}
-
-// return list of categories this item belongs to
-std::vector<string> item_base::categories () const
-{
- std::vector<string> categories;
- PyObject *list = get_attribute ("Categories");
- PyObject *str;
-
- if (!PySequence_Check (list)) return categories;
-
- // get all category strings
- for (int i = 0; i < PySequence_Size (list); i++)
- {
- str = PySequence_GetItem (list, i);
- if (PyString_Check (str))
- categories.push_back (python::as_string (str));
- Py_XDECREF (str);
- }
-
- // cleanup
- Py_DECREF (list);
-
- return categories;
-}
-
-
-/*
-// recharge item
-u_int16 item_base::recharge (u_int16 &charge)
-{
- Charge += charge;
-
- if (Charge > MaxCharge)
- {
- charge = Charge - MaxCharge;
- Charge = MaxCharge;
- }
- else charge = 0;
-
- return charge;
-}
-*/
-
-// compare two items for equality
-bool item_base::equals (item_base *item)
-{
- if (!Mutable) return this == item;
- else return name () == item->name ();
-}
-
-// add item(s) to this stack
-void item_base::stack (item_base *item)
-{
- item_base *bottom = this;
-
- // add given stack on top of our own stack
- while (bottom->Next) bottom = bottom->Next;
- bottom->Next = item;
-}
-
-// remove item(s) from this stack
-item_base *item_base::split (u_int32 count)
-{
- // in case of count = 0, this is a noop
- if (count == 0) return this;
-
- item_base *remaining, *stack = this;
-
- // retrieve the topmost items
- while (--count) stack = stack->Next;
- remaining = stack->Next;
-
- // split this stack
- stack->Next = NULL;
- set_slot (NULL);
-
- return remaining;
-}
diff --git a/src/item_base.h b/src/item_base.h
deleted file mode 100644
index c6d62cc..0000000
--- a/src/item_base.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file item_base.h
- * @author Kai Sterker <address@hidden>
- *
- * @brief Superclass for all items.
- */
-
-
-#ifndef ITEM_BASE_H
-#define ITEM_BASE_H
-
-#include <vector>
-#include "py_object.h"
-#include "slot.h"
-
-using std::string;
-
-class character_base;
-
-/**
- * The Python package containing %item scripts.
- */
-#ifndef SWIG
-# define ITEM_PACKAGE "item."
-#endif
-
-/**
- * It is a wrapper for item.py, which is the actual item superclass.
- * For flexibility, items are implemented on python side. But since they
- * are often used on C++ side, this class provides methods to the most
- * basic item attributes and all possible actions an item might support.
- *
- * So while each item does have the wrapped attributes, an item may only
- * implement a subset of the available actions ("pick_up", "drop", "equip",
- * "unequip", "combine" and "use"). Further, an item may have additional
- * attributes. If required, they can be accessed via methods provided by
- * the py_object class.
- *
- * There are two 'classes' of items. Of immutable items, only one %object
- * will be instanciated when loading a saved %game. All copies of such an
- * item are actually references to the one object. Mutable items however
- * will be instanciated as often as copies of that item exist.
- */
-class item_base : public py_object
-{
-public:
-
- /**
- * Default constructor. Creates an empty item. For safety reasons
- * the item's 'class' has to set at construction time. It cannot
- * be changed ever after.
- * @param is_mutable whether the item may change its state or not.
- * @see is_mutable ()
- */
- item_base (bool is_mutable) : py_object ()
- {
- Mutable = is_mutable;
- MaxStack = 1;
- Next = NULL;
- Slot = NULL;
- }
-
-#ifndef SWIG
- /**
- * Create a new item from the given item data.
- * @param item Name of the item data file defining the desired item.
- */
- item_base (const string & item);
-#endif
-
- /**
- * Destructor.
- */
- ~item_base ();
-
- /**
- * Removes an item from its slot and deletes it if necessary. This
- * method should be preferred over deleting an item directly, as it
- * takes care of both mutable and immutable items.
- */
- void destroy ()
- {
- if (!Mutable)
- {
- if (Slot) Slot->remove (this);
- }
- else delete this;
- }
-
- /**
- * @name Item Actions
- */
- //@{
- /**
- * This method is invoked when the item is equipped by a character. It can
- * be used to trigger special events.
- * @param target the slot to which the items where added
- */
- void equipped (slot *target);
-
- /**
- * This method is invoked when this item is unequipped by a character.
- * It can be used to trigger special events.
- * @param target the slot from which the items where removed
- */
- void unequipped (slot *target);
-
- /**
- * Check whether this item can be equipped by the given character.
- * @param character The character that wants to equip this item.
- * @return \b true if the character can equip the item, \b false otherwise.
- */
- bool can_equip (character_base *character);
-
- /**
- * Use an item. Triggers its main functionality if it can be used at all.
- * @param character The character using this item.
- * @return \b true if item has been used successfully, \b false otherwise.
- */
- bool use (character_base *character);
-
- /**
- * Combine this item with another item. Returns the result of the
- * combination, or NULL if the combination fails.
- * @param item the item to combine with this one
- * @return item resulting from combination, or \c NULL if combination
fails.
- */
- item_base *combine (item_base * item);
- //@}
-
- /**
- * @name Attribute access
- */
- //@{
- /**
- * Get the item's name.
- * @return name of the item.
- */
- string name ()
- {
- return get_attribute_string ("Name");
- }
-
- /**
- * Set the item's name.
- * @param name the item's new name.
- */
- void set_name (const string & name)
- {
- set_attribute_string ("Name", name);
- }
-
- /**
- * Make the item member of the given category.
- * @param category the category this item should belong to.
- */
- void add_category (const string & category)
- {
- PyObject *args = Py_BuildValue ("(s)", (char *) category.c_str ());
- call_method ("add_category", args);
- }
-
- /**
- * Take a category away from the item.
- * @param category the category to remove from the item.
- */
- void remove_category (const string & category)
- {
- PyObject *args = Py_BuildValue ("(s)", (char *) category.c_str ());
- call_method ("remove_category", args);
- }
-
- /**
- * Check whether item belongs to a certain category.
- * @param category the category to test against.
- * @return \b true if item belongs to given category, \b false otherwise.
- */
- bool is_a (const string & category)
- {
- int result = 0;
- PyObject *args = Py_BuildValue ("(s)", (char *) category.c_str ());
- PyObject *retval = call_method_ret ("is_a", args);
-
- if (retval && PyInt_Check (retval)) result = PyInt_AS_LONG (retval);
- Py_XDECREF (retval);
-
- return (result != 0);
- }
-
- /**
- * Retrieve a list of categories this item belongs to.
- * @return List of item categories.
- */
- std::vector<string> categories () const;
-
- /**
- * Get the charge the item has left.
- * @return number of charges the item has.
- */
- u_int16 charge ()
- {
- return (u_int16) get_attribute_int ("Charge");
- }
-
- /**
- * Set the number of charges the item may hold.
- * @param charge item's number of charges.
- */
- void set_charge (u_int16 charge)
- {
- set_attribute_int ("Charge", charge);
- }
-
- /**
- * Get the maximum number of charges the item may hold.
- * @return item's maximum number of charges.
- */
- u_int16 max_charge ()
- {
- return (u_int16) get_attribute_int ("MaxCharge");
- }
-
- /**
- * Set the maximum number of charges the item may hold.
- * @param max_charge item's maximum number of charges.
- */
- void set_max_charge (u_int16 max_charge)
- {
- set_attribute_int ("MaxCharge", max_charge);
- }
-
- /**
- * Check whether the item is mutable or immutable. Mutable
- * items are those that may change their attributes during
- * livetime. Therefore they need to be treated different
- * from items that do never change as long as they live.
- * @return \b true if the item is mutable, \b false otherwise.
- */
- bool is_mutable () const
- {
- return Mutable;
- }
-
- /**
- * If the item is kept in an inventory, it will be assigned
- * to a certain slot. For mutable items, the assignment will be
- * pertinent. For immutable items however, it will be only temporary
- * and only valid for the item that is currently manipulated. In
- * reality, no difference should be notable though.
- * @return slot holding the item or \c NULL, if it isn't kept in
- * an inventory.
- */
- slot *get_slot () const
- {
- return Slot;
- }
-
- /**
- * Set the slot this (stack of) item(s) is kept in.
- * @param s the slot to assign to the item(s).
- */
- void set_slot (slot *s)
- {
- Slot = s;
- if (Next != NULL) Next->set_slot (s);
- }
-
- /**
- * Check how many items of this kind may be stacked in one slot.
- * @return maximum size of a stack of this kind of item.
- */
- u_int32 max_stack () const
- {
- return MaxStack;
- }
-
- /**
- * Set how many items of this kind may be stacked in one slot.
- * @param max_stack maximum size of a stack of this kind of item.
- */
- void set_max_stack (u_int32 max_stack)
- {
- MaxStack = max_stack;
- }
- //@}
-
- /**
- * @name Loading/Saving
- */
- //@{
-#ifndef SWIG
- /**
- * Load item from named file. This will first load the item template
- * to instanciate the underlying Python item class. Then it will
- * restore the actual item data. If an item is already instanciated,
- * it will be replaced.
- *
- * @param file name of the file to load item from.
- * @return \b true if loading successful, \b false otherwise.
- */
- bool get_state (const string & file);
-
- /**
- * Save item to named file. This will save both the item template
- * plus the actual data to the given file. The file will be replaced
- * if it already exists.
- *
- * @param file name of the file to save item to.
- * @return \b true if saving successful, \b false otherwise.
- */
- bool put_state (const string & file) const;
-#endif
-
- // wrappers needed for SWIG
- bool load (const string & file) { return get_state (file); }
- bool save (const string & file) { return put_state (file); }
-
- /**
- * Load item from stream. This will first load the item template
- * to instanciate the underlying Python item class. Then it will
- * restore the actual item data. If an item is already instanciated,
- * it will be replaced.
- *
- * @param file stream to load item from.
- * @return \b true if loading successful, \b false otherwise.
- */
- bool get_state (igzstream & file);
-
- /**
- * Save item to stream. This will save both the item template
- * plus the actual data to the given file. The file will be replaced
- * if it already exists.
- *
- * @param file stream to save item to.
- * @return \b true if saving successful, \b false otherwise.
- */
- bool put_state (ogzstream & file) const;
- //@}
-
- /**
- * Chack whether two are of the same kind. For mutable items this is
- * the case if they have the same name. For immutable items, they need
- * to be the same instances.
- * @param the item to compare this one to.
- * @return \b true if items are (roughly) equal, \b false otherwise.
- */
- bool equals (item_base *item);
-
-protected:
-#ifndef SWIG
- /**
- * The number of items that can be stacked
- */
- u_int32 MaxStack;
-
- /**
- * The slot this item is kept in.
- */
- slot *Slot;
-
- /**
- * Whether the item is mutable or immutable
- */
- bool Mutable;
-
- /**
- * If we're dealing with a stack of mutable items, Next will point
- * to the next item in the stack.
- */
- item_base *Next;
-
- /**
- * @name Item Stack handling
- */
- //@{
- friend u_int32 slot::add (item_base * item, const u_int32 & count = 1);
- friend u_int32 slot::remove (item_base * item, const u_int32 & count = 1);
-
- /**
- * Add an item (or stack of items) to this item's stack. We assume
- * that checks for item equality and number of items on the stack
- * have been made already. That's why this method is only available
- * to friends of %item_base. In fact, it should only be used by
- * slot::add_item and slot::remove_item.
- * @param stack Item (stack) to be added to this item. It will be the
- * new top of stack.
- */
- void stack (item_base *stack);
-
- /**
- * Retrieve number items from this stack. This method will return
- * the topmost item(s) of the stack. Like item_base::stack, this
- * method is only available to the slot class.
- * @param number Number of items to retrieve from the stack.
- * @return the item(s) remaining in this stack.
- */
- item_base *split (u_int32 number = 1);
- //@}
-#endif // SWIG
-};
-
-#endif // ITEM_BASE_H
diff --git a/src/item_storage.cc b/src/item_storage.cc
deleted file mode 100644
index df1b7e5..0000000
--- a/src/item_storage.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file item_storage.cc
- * @author Kai Sterker <address@hidden>
- *
- * @brief Global storage for immutable items.
- */
-
-#include "item_storage.h"
-
-/**
- * Hashmap for keeping immutable items
- */
-dictionary<item_base*> item_storage::Items;
-
-// delete all items
-void item_storage::cleanup ()
-{
- std::hash_map<std::string, item_base*>::iterator i;
-
- // just a precaution
- for (i = Items.begin (); i != Items.end (); i++)
- (*i).second->set_slot (NULL);
-
- Items.clear ();
-}
-
-// add an (immutable) item
-void item_storage::add (item_base *item)
-{
- if (!item || item->is_mutable ()) return;
-
- // items are stored by name
- Items[item->name ()] = item;
-}
-
-// get an item from storage
-item_base *item_storage::get (const string & name)
-{
- std::hash_map<std::string, item_base*>::iterator i = Items.find (name);
- item_base *item;
-
- // no such item
- if (i == Items.end ())
- {
- // assume that it is a mutable item ...
- item = new item_base (true);
-
- // ... and return it if that is the case
- if (item->get_state (name) && item->is_mutable ()) return item;
-
- fprintf (stderr, "*** error: item_storage::get: no item called
'%s'\n", name.c_str ());
-
- delete item;
- return NULL;
- }
-
- // retrieve item
- item = (*i).second;
-
- // make sure that items from the storage have no inventory assigned
- item->set_slot (NULL);
-
- return item;
-}
-
-// save storage to disk
-bool item_storage::put_state (ogzstream & file)
-{
- std::hash_map<std::string, item_base*>::iterator i;
-
- // iterate over hash_map and save all the items
- for (i = Items.begin (); i != Items.end (); i++)
- {
- true >> file;
- (*i).second->put_state (file);
- }
-
- // no more items follow
- false >> file;
-
- return true;
-}
-
-// load storage from disk
-bool item_storage::get_state (igzstream & file)
-{
- item_base *item;
- bool more;
- more << file;
-
- while (more)
- {
- // retrieve item from file
- item = new item_base (false);
- item->get_state (file);
-
- // add item to storage
- Items[item->name ()] = item;
-
- // check whether more items follow
- more << file;
- }
-
- return true;
-}
diff --git a/src/item_storage.h b/src/item_storage.h
deleted file mode 100644
index cdd4793..0000000
--- a/src/item_storage.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file item_storage.h
- * @author Kai Sterker <address@hidden>
- *
- * @brief Global storage for immutable items.
- */
-
-#ifndef ITEM_STORAGE_H
-#define ITEM_STORAGE_H
-
-#include "storage.h"
-#include "item_base.h"
-
-using std::string;
-
-/**
- * For efficiency reasons, immutable items are only instanciated once
- * throughout a game. In order to access them, they are kept in a globally
- * available %storage.
- */
-class item_storage
-{
-public:
- /**
- * Initialization at engine startup.
- */
- static void init () {}
-
- /**
- * Remove all items from the %storage. This should be done whenever
- * a %game is unloaded.
- */
- static void cleanup ();
-
- /**
- * @name Item handling
- */
- //@{
- /**
- * Add an item to the %storage. The item needs to be immutable,
- * otherwise it won't be added. It should also have a unique name.
- * @param item The item to add to the storage
- */
- static void add (item_base *item);
-
- /**
- * Retrieve immutable item with given name from the %storage.
- * Instead of an immutable item's name, one may also pass the file
- * name of a mutable item. In that case, the mutable item will be
- * instanciated and returned.
- * @param name name of the item to retrieve.
- * @return item with given name, or \c NULL if no such item exists.
- */
- static item_base *get (const string & name);
- //@}
-
-#ifndef SWIG
- /**
- * @name Loading/Saving
- */
- //@{
- /**
- * Load all items kept in the %storage from stream.
- * @param file stream to load items from.
- * @return \b true if loading successful, \b false otherwise.
- */
- static bool get_state (igzstream & file);
-
- /**
- * Save contents of the %storage to a stream.
- * @param file stream to save %item_storage to.
- * @return \b true if saving successful, \b false otherwise.
- */
- static bool put_state (ogzstream & file);
- //@}
-
-private:
- /**
- * Hashmap for keeping the items
- */
- static dictionary<item_base*> Items;
-#endif // SWIG
-};
-
-#endif // ITEM_STORAGE_H
diff --git a/src/label.cc b/src/label.cc
index d0fe38c..a9ebbe4 100644
--- a/src/label.cc
+++ b/src/label.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001/2004 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "label.h"
diff --git a/src/label.h b/src/label.h
index cba88a0..3730feb 100644
--- a/src/label.h
+++ b/src/label.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001/2004 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LABEL_H_
diff --git a/src/label_input.cc b/src/label_input.cc
index 47521da..692d622 100644
--- a/src/label_input.cc
+++ b/src/label_input.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001/2003/2004 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "label_input.h"
diff --git a/src/label_input.h b/src/label_input.h
index e93d0a1..1bca00a 100644
--- a/src/label_input.h
+++ b/src/label_input.h
@@ -1,14 +1,19 @@
/*
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LABEL_INPUT_H_
diff --git a/src/landmap.cc b/src/landmap.cc
index 236fb68..192606a 100644
--- a/src/landmap.cc
+++ b/src/landmap.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/landmap.h b/src/landmap.h
index 357f3f7..3a3045c 100644
--- a/src/landmap.h
+++ b/src/landmap.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/lex.prefs.cc b/src/lex.prefs.cc
deleted file mode 100644
index 1d15055..0000000
--- a/src/lex.prefs.cc
+++ /dev/null
@@ -1,1910 +0,0 @@
-#line 2 "lex.prefs.cc"
-
-#line 4 "lex.prefs.cc"
-
-#define YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define yy_create_buffer prefs_create_buffer
-#define yy_delete_buffer prefs_delete_buffer
-#define yy_flex_debug prefs_flex_debug
-#define yy_init_buffer prefs_init_buffer
-#define yy_flush_buffer prefs_flush_buffer
-#define yy_load_buffer_state prefs_load_buffer_state
-#define yy_switch_to_buffer prefs_switch_to_buffer
-#define yyin prefsin
-#define yyleng prefsleng
-#define yylex prefslex
-#define yylineno prefslineno
-#define yyout prefsout
-#define yyrestart prefsrestart
-#define yytext prefstext
-#define yywrap prefswrap
-#define yyalloc prefsalloc
-#define yyrealloc prefsrealloc
-#define yyfree prefsfree
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state. The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE prefsrestart(prefsin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
-#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
-#endif
-
-/* The state buf must be large enough to hold one state per character in the
main buffer.
- */
-#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t prefsleng;
-
-extern FILE *prefsin, *prefsout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
- #define YY_LESS_LINENO(n)
- #define YY_LINENO_REWIND_TO(ptr)
-
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up prefstext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
- *yy_cp = (yy_hold_char); \
- YY_RESTORE_YY_MORE_OFFSET \
- (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up prefstext again */ \
- } \
- while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr) )
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
-
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
-
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int yy_fill_buffer;
-
- int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via prefsrestart()), so that the user can continue scanning by
- * just pointing prefsin at a new input file.
- */
-#define YY_BUFFER_EOF_PENDING 2
-
- };
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
- ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
- : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-
-/* yy_hold_char holds the character lost when prefstext is formed. */
-static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-yy_size_t prefsleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0; /* whether we need to initialize */
-static int yy_start = 0; /* start state number */
-
-/* Flag which is used to allow prefswrap()'s to do buffer switches
- * instead of setting up a fresh prefsin. A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void prefsrestart (FILE *input_file );
-void prefs_switch_to_buffer (YY_BUFFER_STATE new_buffer );
-YY_BUFFER_STATE prefs_create_buffer (FILE *file,int size );
-void prefs_delete_buffer (YY_BUFFER_STATE b );
-void prefs_flush_buffer (YY_BUFFER_STATE b );
-void prefspush_buffer_state (YY_BUFFER_STATE new_buffer );
-void prefspop_buffer_state (void );
-
-static void prefsensure_buffer_stack (void );
-static void prefs_load_buffer_state (void );
-static void prefs_init_buffer (YY_BUFFER_STATE b,FILE *file );
-
-#define YY_FLUSH_BUFFER prefs_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE prefs_scan_buffer (char *base,yy_size_t size );
-YY_BUFFER_STATE prefs_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE prefs_scan_bytes (yyconst char *bytes,yy_size_t len );
-
-void *prefsalloc (yy_size_t );
-void *prefsrealloc (void *,yy_size_t );
-void prefsfree (void * );
-
-#define yy_new_buffer prefs_create_buffer
-
-#define yy_set_interactive(is_interactive) \
- { \
- if ( ! YY_CURRENT_BUFFER ){ \
- prefsensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
- prefs_create_buffer(prefsin,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
- }
-
-#define yy_set_bol(at_bol) \
- { \
- if ( ! YY_CURRENT_BUFFER ){\
- prefsensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
- prefs_create_buffer(prefsin,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
- }
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-#define prefswrap() (/*CONSTCOND*/1)
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-FILE *prefsin = (FILE *) 0, *prefsout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int prefslineno;
-
-int prefslineno = 1;
-
-extern char *prefstext;
-#ifdef yytext_ptr
-#undef yytext_ptr
-#endif
-#define yytext_ptr prefstext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
-static int yy_get_next_buffer (void );
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__noreturn__))
-#endif
-static void yy_fatal_error (yyconst char msg[] );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up prefstext.
- */
-#define YY_DO_BEFORE_ACTION \
- (yytext_ptr) = yy_bp; \
- prefsleng = (size_t) (yy_cp - yy_bp); \
- (yy_hold_char) = *yy_cp; \
- *yy_cp = '\0'; \
- (yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 18
-#define YY_END_OF_BUFFER 19
-/* This struct is not used in this scanner,
- but its presence is necessary. */
-struct yy_trans_info
- {
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
-static yyconst flex_int16_t yy_accept[108] =
- { 0,
- 0, 0, 0, 0, 19, 17, 16, 16, 1, 15,
- 17, 17, 17, 17, 17, 17, 17, 12, 14, 13,
- 16, 1, 1, 15, 0, 0, 0, 0, 0, 0,
- 0, 14, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 5, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 3, 0, 0, 0, 11, 0, 0, 0,
- 0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 6, 0, 0, 0, 0, 0,
- 2, 0, 0, 0, 10, 0, 0, 0, 7, 0,
-
- 0, 0, 0, 8, 0, 9, 0
- } ;
-
-static yyconst YY_CHAR yy_ec[256] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 1, 1, 4, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 5, 1, 1, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 1, 1, 1,
- 1, 1, 1, 1, 7, 1, 1, 8, 1, 9,
- 1, 1, 1, 1, 1, 10, 1, 1, 1, 1,
- 11, 1, 12, 1, 1, 13, 1, 1, 1, 1,
- 14, 1, 15, 1, 1, 1, 16, 1, 17, 18,
-
- 19, 1, 20, 21, 22, 1, 23, 24, 25, 26,
- 27, 28, 1, 29, 30, 31, 32, 33, 1, 1,
- 34, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static yyconst YY_CHAR yy_meta[35] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 2, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1
- } ;
-
-static yyconst flex_uint16_t yy_base[112] =
- { 0,
- 0, 13, 112, 111, 125, 128, 26, 28, 121, 117,
- 90, 99, 93, 103, 86, 100, 97, 128, 0, 128,
- 30, 112, 128, 108, 95, 82, 85, 84, 87, 79,
- 78, 0, 84, 77, 73, 83, 85, 82, 70, 72,
- 74, 128, 65, 73, 76, 72, 88, 76, 75, 85,
- 63, 61, 17, 53, 66, 61, 79, 57, 61, 62,
- 64, 52, 128, 59, 50, 51, 128, 59, 44, 48,
- 48, 128, 55, 43, 43, 41, 39, 34, 47, 46,
- 37, 38, 37, 35, 128, 40, 39, 25, 30, 29,
- 128, 21, 13, 38, 128, 12, 19, 11, 128, 12,
-
- 22, 11, 5, 128, 16, 128, 128, 50, 52, 54,
- 0
- } ;
-
-static yyconst flex_int16_t yy_def[112] =
- { 0,
- 108, 108, 109, 109, 107, 107, 107, 107, 110, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 111, 107,
- 107, 110, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 111, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
-
- 107, 107, 107, 107, 107, 107, 0, 107, 107, 107,
- 107
- } ;
-
-static yyconst flex_uint16_t yy_nxt[163] =
- { 0,
- 32, 7, 8, 9, 107, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 7, 8, 9, 107, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 21, 21, 21,
- 21, 21, 21, 59, 106, 105, 104, 103, 102, 101,
- 100, 99, 98, 97, 96, 60, 61, 95, 94, 62,
- 6, 6, 19, 19, 22, 22, 93, 92, 91, 90,
- 89, 88, 87, 86, 85, 84, 83, 82, 81, 80,
- 79, 78, 77, 76, 75, 74, 73, 72, 71, 70,
- 69, 68, 67, 66, 65, 64, 63, 58, 57, 56,
- 55, 54, 53, 52, 51, 50, 49, 48, 47, 46,
-
- 45, 44, 43, 42, 41, 40, 39, 38, 37, 36,
- 35, 34, 33, 24, 23, 31, 30, 29, 28, 27,
- 26, 25, 24, 23, 107, 20, 20, 5, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107
- } ;
-
-static yyconst flex_int16_t yy_chk[163] =
- { 0,
- 111, 1, 1, 1, 0, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 2, 2, 2, 0, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 7, 7, 8,
- 8, 21, 21, 53, 105, 103, 102, 101, 100, 98,
- 97, 96, 94, 93, 92, 53, 53, 90, 89, 53,
- 108, 108, 109, 109, 110, 110, 88, 87, 86, 84,
- 83, 82, 81, 80, 79, 78, 77, 76, 75, 74,
- 73, 71, 70, 69, 68, 66, 65, 64, 62, 61,
- 60, 59, 58, 57, 56, 55, 54, 52, 51, 50,
- 49, 48, 47, 46, 45, 44, 43, 41, 40, 39,
-
- 38, 37, 36, 35, 34, 33, 31, 30, 29, 28,
- 27, 26, 25, 24, 22, 17, 16, 15, 14, 13,
- 12, 11, 10, 9, 5, 4, 3, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
- 107, 107
- } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int prefs_flex_debug;
-int prefs_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *prefstext;
-#line 1 "prefs.l"
-#line 2 "prefs.l"
-/*
- $Id$
-
- Copyright (C) 2000/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-#include <math.h>
-#include <string>
-#include "prefs.h"
-
-#define YY_DECL int parse_adonthellrc (int &mynum, string &mytext)
-
-#line 579 "lex.prefs.cc"
-
-#define INITIAL 0
-#define text 1
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
- These are made visible to non-reentrant scanners for convenience. */
-
-int prefslex_destroy (void );
-
-int prefsget_debug (void );
-
-void prefsset_debug (int debug_flag );
-
-YY_EXTRA_TYPE prefsget_extra (void );
-
-void prefsset_extra (YY_EXTRA_TYPE user_defined );
-
-FILE *prefsget_in (void );
-
-void prefsset_in (FILE * _in_str );
-
-FILE *prefsget_out (void );
-
-void prefsset_out (FILE * _out_str );
-
-yy_size_t prefsget_leng (void );
-
-char *prefsget_text (void );
-
-int prefsget_lineno (void );
-
-void prefsset_lineno (int _line_number );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int prefswrap (void );
-#else
-extern int prefswrap (void );
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
-#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( prefstext, prefsleng, 1, prefsout )) {} } while
(0)
-#endif
-
-/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
- size_t n; \
- for ( n = 0; n < max_size && \
- (c = getc( prefsin )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( prefsin ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, prefsin))==0 &&
ferror(prefsin)) \
- { \
- if( errno != EINTR) \
- { \
- YY_FATAL_ERROR( "input in flex scanner failed"
); \
- break; \
- } \
- errno=0; \
- clearerr(prefsin); \
- } \
- }\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int prefslex (void);
-
-#define YY_DECL int prefslex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after prefstext and prefsleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK /*LINTED*/break;
-#endif
-
-#define YY_RULE_SETUP \
- YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
- yy_state_type yy_current_state;
- char *yy_cp, *yy_bp;
- int yy_act;
-
- if ( !(yy_init) )
- {
- (yy_init) = 1;
-
-#ifdef YY_USER_INIT
- YY_USER_INIT;
-#endif
-
- if ( ! (yy_start) )
- (yy_start) = 1; /* first start state */
-
- if ( ! prefsin )
- prefsin = stdin;
-
- if ( ! prefsout )
- prefsout = stdout;
-
- if ( ! YY_CURRENT_BUFFER ) {
- prefsensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- prefs_create_buffer(prefsin,YY_BUF_SIZE );
- }
-
- prefs_load_buffer_state( );
- }
-
- {
-#line 29 "prefs.l"
-
-
-#line 799 "lex.prefs.cc"
-
- while ( /*CONSTCOND*/1 ) /* loops until end-of-file is
reached */
- {
- yy_cp = (yy_c_buf_p);
-
- /* Support of prefstext. */
- *yy_cp = (yy_hold_char);
-
- /* yy_bp points to the position in yy_ch_buf of the start of
- * the current run.
- */
- yy_bp = yy_cp;
-
- yy_current_state = (yy_start);
-yy_match:
- do
- {
- YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] !=
yy_current_state )
- {
- yy_current_state = (int)
yy_def[yy_current_state];
- if ( yy_current_state >= 108 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] +
(unsigned int) yy_c];
- ++yy_cp;
- }
- while ( yy_current_state != 107 );
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
-
-yy_find_action:
- yy_act = yy_accept[yy_current_state];
-
- YY_DO_BEFORE_ACTION;
-
-do_action: /* This label is used only to access EOF actions. */
-
- switch ( yy_act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = (yy_hold_char);
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- goto yy_find_action;
-
-case 1:
-/* rule 1 can match eol */
-YY_RULE_SETUP
-#line 31 "prefs.l"
-; /* Eat up comments */
- YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 33 "prefs.l"
-return PREFS_SCREEN_MODE;
- YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 34 "prefs.l"
-return PREFS_DISPLAY;
- YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 35 "prefs.l"
-return PREFS_LANGUAGE;
- YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 36 "prefs.l"
-return PREFS_FONT;
- YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 37 "prefs.l"
-return PREFS_QUICK_LOAD;
- YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 38 "prefs.l"
-return PREFS_AUDIO_CHANNELS;
- YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 39 "prefs.l"
-return PREFS_AUDIO_RESOLUTION;
- YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 40 "prefs.l"
-return PREFS_AUDIO_SAMPLE_RATE;
- YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 41 "prefs.l"
-return PREFS_AUDIO_VOLUME;
- YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 42 "prefs.l"
-return PREFS_VERSION;
- YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 44 "prefs.l"
-mytext = ""; BEGIN(text);
- YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 45 "prefs.l"
-BEGIN(INITIAL); return PREFS_STR;
- YY_BREAK
-case 14:
-/* rule 14 can match eol */
-YY_RULE_SETUP
-#line 46 "prefs.l"
-mytext += prefstext;
- YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 48 "prefs.l"
-mynum = atoi (prefstext); return PREFS_NUM;
- YY_BREAK
-case 16:
-/* rule 16 can match eol */
-YY_RULE_SETUP
-#line 50 "prefs.l"
-;
- YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 51 "prefs.l"
-return PREFS_UNKNOWN;
- YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 52 "prefs.l"
-ECHO;
- YY_BREAK
-#line 945 "lex.prefs.cc"
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(text):
- yyterminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) -
1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = (yy_hold_char);
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status ==
YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed prefsin at a new source and called
- * prefslex(). If so, then we have to assure
- * consistency between YY_CURRENT_BUFFER and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = prefsin;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for yy_c_buf_p "<=" to the position
- * of the first EOB in the buffer, since yy_c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( (yy_c_buf_p) <=
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- { /* This was really a NUL. */
- yy_state_type yy_next_state;
-
- (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * yy_get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- yy_next_state = yy_try_NUL_trans( yy_current_state );
-
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
- if ( yy_next_state )
- {
- /* Consume the NUL. */
- yy_cp = ++(yy_c_buf_p);
- yy_current_state = yy_next_state;
- goto yy_match;
- }
-
- else
- {
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
- goto yy_find_action;
- }
- }
-
- else switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_END_OF_FILE:
- {
- (yy_did_buffer_switch_on_eof) = 0;
-
- if ( prefswrap( ) )
- {
- /* Note: because we've taken care in
- * yy_get_next_buffer() to have set up
- * prefstext, we can now set up
- * yy_c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- (yy_c_buf_p) = (yytext_ptr) +
YY_MORE_ADJ;
-
- yy_act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
- }
- break;
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) =
- (yytext_ptr) +
yy_amount_of_matched_text;
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_match;
-
- case EOB_ACT_LAST_MATCH:
- (yy_c_buf_p) =
-
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
- yy_current_state = yy_get_previous_state( );
-
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
- goto yy_find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
- } /* end of user's declarations */
-} /* end of prefslex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
- char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- char *source = (yytext_ptr);
- yy_size_t number_to_move, i;
- int ret_val;
-
- if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) +
1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
-
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
-
- /* Try to read more data. */
-
- /* First move last chars to start of buffer. */
- number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status ==
YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
- else
- {
- yy_size_t num_to_read =
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move
- 1;
-
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
-
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-
- int yy_c_buf_p_offset =
- (int) ((yy_c_buf_p) - b->yy_ch_buf);
-
- if ( b->yy_is_our_buffer )
- {
- yy_size_t new_size = b->yy_buf_size * 2;
-
- if ( new_size <= 0 )
- b->yy_buf_size += b->yy_buf_size / 8;
- else
- b->yy_buf_size *= 2;
-
- b->yy_ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- prefsrealloc((void *)
b->yy_ch_buf,b->yy_buf_size + 2 );
- }
- else
- /* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
-
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
-
- (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
- number_to_move - 1;
-
- }
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- /* Read in more data. */
- YY_INPUT(
(&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), num_to_read );
-
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- if ( (yy_n_chars) == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- prefsrestart(prefsin );
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- if ((int) ((yy_n_chars) + number_to_move) >
YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >>
1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *)
prefsrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in
yy_get_next_buffer()" );
- }
-
- (yy_n_chars) += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] =
YY_END_OF_BUFFER_CHAR;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] =
YY_END_OF_BUFFER_CHAR;
-
- (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
- return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached
*/
-
- static yy_state_type yy_get_previous_state (void)
-{
- yy_state_type yy_current_state;
- char *yy_cp;
-
- yy_current_state = (yy_start);
-
- for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp
)
- {
- YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] !=
yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 108 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned
int) yy_c];
- }
-
- return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- * next_state = yy_try_NUL_trans( current_state );
- */
- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
-{
- int yy_is_jam;
- char *yy_cp = (yy_c_buf_p);
-
- YY_CHAR yy_c = 1;
- if ( yy_accept[yy_current_state] )
- {
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
- }
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 108 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int)
yy_c];
- yy_is_jam = (yy_current_state == 107);
-
- return yy_is_jam ? 0 : yy_current_state;
-}
-
-#ifndef YY_NO_UNPUT
-
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
- static int yyinput (void)
-#else
- static int input (void)
-#endif
-
-{
- int c;
-
- *(yy_c_buf_p) = (yy_hold_char);
-
- if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( (yy_c_buf_p) <
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
- /* This was really a NUL. */
- *(yy_c_buf_p) = '\0';
-
- else
- { /* need more input */
- yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
- ++(yy_c_buf_p);
-
- switch ( yy_get_next_buffer( ) )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- prefsrestart(prefsin );
-
- /*FALLTHROUGH*/
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( prefswrap( ) )
- return EOF;
-
- if ( ! (yy_did_buffer_switch_on_eof) )
- YY_NEW_FILE;
-#ifdef __cplusplus
- return yyinput();
-#else
- return input();
-#endif
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) = (yytext_ptr) + offset;
- break;
- }
- }
- }
-
- c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
- *(yy_c_buf_p) = '\0'; /* preserve prefstext */
- (yy_hold_char) = *++(yy_c_buf_p);
-
- return c;
-}
-#endif /* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- *
- * @note This function does not reset the start condition to @c INITIAL .
- */
- void prefsrestart (FILE * input_file )
-{
-
- if ( ! YY_CURRENT_BUFFER ){
- prefsensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- prefs_create_buffer(prefsin,YY_BUF_SIZE );
- }
-
- prefs_init_buffer(YY_CURRENT_BUFFER,input_file );
- prefs_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- *
- */
- void prefs_switch_to_buffer (YY_BUFFER_STATE new_buffer )
-{
-
- /* TODO. We should be able to replace this entire function body
- * with
- * prefspop_buffer_state();
- * prefspush_buffer_state(new_buffer);
- */
- prefsensure_buffer_stack ();
- if ( YY_CURRENT_BUFFER == new_buffer )
- return;
-
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
- prefs_load_buffer_state( );
-
- /* We don't actually know whether we did this switch during
- * EOF (prefswrap()) processing, but the only time this flag
- * is looked at is after prefswrap() is called, so it's safe
- * to go ahead and always set it.
- */
- (yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void prefs_load_buffer_state (void)
-{
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- prefsin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
- (yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c
YY_BUF_SIZE.
- *
- * @return the allocated buffer state.
- */
- YY_BUFFER_STATE prefs_create_buffer (FILE * file, int size )
-{
- YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) prefsalloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in
prefs_create_buffer()" );
-
- b->yy_buf_size = (yy_size_t)size;
-
- /* yy_ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->yy_ch_buf = (char *) prefsalloc(b->yy_buf_size + 2 );
- if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in
prefs_create_buffer()" );
-
- b->yy_is_our_buffer = 1;
-
- prefs_init_buffer(b,file );
-
- return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with prefs_create_buffer()
- *
- */
- void prefs_delete_buffer (YY_BUFFER_STATE b )
-{
-
- if ( ! b )
- return;
-
- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
- if ( b->yy_is_our_buffer )
- prefsfree((void *) b->yy_ch_buf );
-
- prefsfree((void *) b );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a prefsrestart() or at EOF.
- */
- static void prefs_init_buffer (YY_BUFFER_STATE b, FILE * file )
-
-{
- int oerrno = errno;
-
- prefs_flush_buffer(b );
-
- b->yy_input_file = file;
- b->yy_fill_buffer = 1;
-
- /* If b is the current buffer, then prefs_init_buffer was _probably_
- * called from prefsrestart() or through yy_get_next_buffer.
- * In that case, we don't want to reset the lineno or column.
- */
- if (b != YY_CURRENT_BUFFER){
- b->yy_bs_lineno = 1;
- b->yy_bs_column = 0;
- }
-
- b->yy_is_interactive = 0;
-
- errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
- */
- void prefs_flush_buffer (YY_BUFFER_STATE b )
-{
- if ( ! b )
- return;
-
- b->yy_n_chars = 0;
-
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
- b->yy_buf_pos = &b->yy_ch_buf[0];
-
- b->yy_at_bol = 1;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- if ( b == YY_CURRENT_BUFFER )
- prefs_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- * the current state. This function will allocate the stack
- * if necessary.
- * @param new_buffer The new state.
- *
- */
-void prefspush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
- if (new_buffer == NULL)
- return;
-
- prefsensure_buffer_stack();
-
- /* This block is copied from prefs_switch_to_buffer. */
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- /* Only push if top exists. Otherwise, replace top. */
- if (YY_CURRENT_BUFFER)
- (yy_buffer_stack_top)++;
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
- /* copied from prefs_switch_to_buffer. */
- prefs_load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- * The next element becomes the new top.
- *
- */
-void prefspop_buffer_state (void)
-{
- if (!YY_CURRENT_BUFFER)
- return;
-
- prefs_delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- if ((yy_buffer_stack_top) > 0)
- --(yy_buffer_stack_top);
-
- if (YY_CURRENT_BUFFER) {
- prefs_load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
- }
-}
-
-/* Allocates the stack if it does not exist.
- * Guarantees space for at least one push.
- */
-static void prefsensure_buffer_stack (void)
-{
- yy_size_t num_to_alloc;
-
- if (!(yy_buffer_stack)) {
-
- /* First allocation is just for 2 elements, since we don't know
if this
- * scanner will even need a stack. We use 2 instead of 1 to
avoid an
- * immediate realloc on the next call.
- */
- num_to_alloc = 1; /* After all that talk, this was set to 1
anyways... */
- (yy_buffer_stack) = (struct yy_buffer_state**)prefsalloc
- (num_to_alloc *
sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in
prefsensure_buffer_stack()" );
-
- memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct
yy_buffer_state*));
-
- (yy_buffer_stack_max) = num_to_alloc;
- (yy_buffer_stack_top) = 0;
- return;
- }
-
- if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
- /* Increase the buffer to prepare for a possible push. */
- yy_size_t grow_size = 8 /* arbitrary grow size */;
-
- num_to_alloc = (yy_buffer_stack_max) + grow_size;
- (yy_buffer_stack) = (struct yy_buffer_state**)prefsrealloc
-
((yy_buffer_stack),
- num_to_alloc *
sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in
prefsensure_buffer_stack()" );
-
- /* zero only the new slots.*/
- memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size
* sizeof(struct yy_buffer_state*));
- (yy_buffer_stack_max) = num_to_alloc;
- }
-}
-
-/** Setup the input buffer state to scan directly from a user-specified
character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE prefs_scan_buffer (char * base, yy_size_t size )
-{
- YY_BUFFER_STATE b;
-
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
-
- b = (YY_BUFFER_STATE) prefsalloc(sizeof( struct yy_buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in prefs_scan_buffer()"
);
-
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->yy_buf_pos = b->yy_ch_buf = base;
- b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
- b->yy_n_chars = b->yy_buf_size;
- b->yy_is_interactive = 0;
- b->yy_at_bol = 1;
- b->yy_fill_buffer = 0;
- b->yy_buffer_status = YY_BUFFER_NEW;
-
- prefs_switch_to_buffer(b );
-
- return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to prefslex()
will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- *
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- * prefs_scan_bytes() instead.
- */
-YY_BUFFER_STATE prefs_scan_string (yyconst char * yystr )
-{
-
- return prefs_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to
prefslex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a
bytes.
- *
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE prefs_scan_bytes (yyconst char * yybytes, yy_size_t
_yybytes_len )
-{
- YY_BUFFER_STATE b;
- char *buf;
- yy_size_t n;
- yy_size_t i;
-
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) prefsalloc(n );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in prefs_scan_bytes()" );
-
- for ( i = 0; i < _yybytes_len; ++i )
- buf[i] = yybytes[i];
-
- buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
- b = prefs_scan_buffer(buf,n );
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in prefs_scan_bytes()" );
-
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->yy_is_our_buffer = 1;
-
- return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up prefstext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
- prefstext[prefsleng] = (yy_hold_char); \
- (yy_c_buf_p) = prefstext + yyless_macro_arg; \
- (yy_hold_char) = *(yy_c_buf_p); \
- *(yy_c_buf_p) = '\0'; \
- prefsleng = yyless_macro_arg; \
- } \
- while ( 0 )
-
-/* Accessor methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- *
- */
-int prefsget_lineno (void)
-{
-
- return prefslineno;
-}
-
-/** Get the input stream.
- *
- */
-FILE *prefsget_in (void)
-{
- return prefsin;
-}
-
-/** Get the output stream.
- *
- */
-FILE *prefsget_out (void)
-{
- return prefsout;
-}
-
-/** Get the length of the current token.
- *
- */
-yy_size_t prefsget_leng (void)
-{
- return prefsleng;
-}
-
-/** Get the current token.
- *
- */
-
-char *prefsget_text (void)
-{
- return prefstext;
-}
-
-/** Set the current line number.
- * @param _line_number line number
- *
- */
-void prefsset_lineno (int _line_number )
-{
-
- prefslineno = _line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param _in_str A readable stream.
- *
- * @see prefs_switch_to_buffer
- */
-void prefsset_in (FILE * _in_str )
-{
- prefsin = _in_str ;
-}
-
-void prefsset_out (FILE * _out_str )
-{
- prefsout = _out_str ;
-}
-
-int prefsget_debug (void)
-{
- return prefs_flex_debug;
-}
-
-void prefsset_debug (int _bdebug )
-{
- prefs_flex_debug = _bdebug ;
-}
-
-static int yy_init_globals (void)
-{
- /* Initialization is the same as for the non-reentrant scanner.
- * This function is called from prefslex_destroy(), so don't allocate here.
- */
-
- (yy_buffer_stack) = 0;
- (yy_buffer_stack_top) = 0;
- (yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = (char *) 0;
- (yy_init) = 0;
- (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
- prefsin = stdin;
- prefsout = stdout;
-#else
- prefsin = (FILE *) 0;
- prefsout = (FILE *) 0;
-#endif
-
- /* For future reference: Set errno on error, since we are called by
- * prefslex_init()
- */
- return 0;
-}
-
-/* prefslex_destroy is for both reentrant and non-reentrant scanners. */
-int prefslex_destroy (void)
-{
-
- /* Pop the buffer stack, destroying each element. */
- while(YY_CURRENT_BUFFER){
- prefs_delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- prefspop_buffer_state();
- }
-
- /* Destroy the stack itself. */
- prefsfree((yy_buffer_stack) );
- (yy_buffer_stack) = NULL;
-
- /* Reset the globals. This is important in a non-reentrant scanner so the
next time
- * prefslex() is called, initialization will occur. */
- yy_init_globals( );
-
- return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-
- int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
- int n;
- for ( n = 0; s[n]; ++n )
- ;
-
- return n;
-}
-#endif
-
-void *prefsalloc (yy_size_t size )
-{
- return (void *) malloc( size );
-}
-
-void *prefsrealloc (void * ptr, yy_size_t size )
-{
-
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
-}
-
-void prefsfree (void * ptr )
-{
- free( (char *) ptr ); /* see prefsrealloc() for (char
*) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 52 "prefs.l"
diff --git a/src/main.cc b/src/main.cc
index 1d150b6..97ed010 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,21 +1,25 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2002/2003/2004 Kai Sterker
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file main.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Contains the main() function.
*
diff --git a/src/manager.cc b/src/manager.cc
deleted file mode 100644
index a5f011a..0000000
--- a/src/manager.cc
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file manager.cc
- * @author Kai Sterker <address@hidden>
- *
- * @brief Takes care of character/item issues.
- */
-
-#include <algorithm>
-#include "manager.h"
-#include "inventory.h"
-
-/**
- * Mapping from item categories to equipment slots.
- */
-std::hash_map<std::string, std::vector<std::string>,
- hash<std::string> > manager::SlotCategoryMap;
-
-// retrieve a list of slots the item would fit into
-const std::vector<std::string> manager::fits (item_base *item)
-{
- if (item == NULL) return std::vector<std::string> ();
-
- std::vector<std::string> slots;
- std::vector<std::string> categories = item->categories ();
- std::vector<std::string>::iterator i;
- std::hash_map<std::string, std::vector<std::string>,
- hash<std::string> >::iterator s;
-
- // find all slots that accept the given category
- for (i = categories.begin (); i != categories.end (); i++)
- {
- s = SlotCategoryMap.find (*i);
- if (s == SlotCategoryMap.end ()) continue;
-
- // append some slots
- slots.insert (slots.end (), (*s).second.begin (), (*s).second.end ());
- }
-
- return slots;
-}
-
-// check whether the item can be equipped in given slot
-bool manager::accepts (slot* target, item_base* item)
-{
- // sanity check
- if (!target || !target->owner () || !item || !target->is_equipment () ||
- target->is_negated ()) return false;
-
- // get slots suitable for this item
- const std::vector<std::string> slots = fits (item);
-
- // is our slot among them?
- if (find (slots.begin (), slots.end (), target->id ()) == slots.end ())
- return false;
-
- // whether the item can be actually equipped depends on the character
- return item->can_equip (target->owner ()->owner ());
-}
-
-// try to equip given item
-item_base *manager::equip (slot *target, item_base *item, u_int32 *count)
-{
- // nothing to do
- if (*count == 0) return NULL;
-
- // item doesn't fit in slot for some reason.
- if (!accepts (target, item)) return item;
-
- slot *source = item->get_slot ();
-
- // make sure that unequip is invoked before item is equipped elsewhere
- if (source && source->is_equipment () && source->count () == *count)
- item->unequipped (source);
-
- // target slot occupied?
- if (target->count () > 0 && !target->accepts (item))
- {
- // exchange items if they are not stackable
- u_int32 old_count = target->count ();
- item_base *old_item = unequip (target, &old_count);
-
- target->add (item, *count);
- item->equipped (target);
-
- *count = old_count;
- return old_item;
- }
- else
- {
- // otherwise try to add as many items as possible
- u_int32 remaining = target->add (item, *count);
-
- // have any items been equipped?
- if (remaining < *count)
- item->equipped (target);
-
- // adjust count
- *count = remaining;
-
- if (*count > 0) return item;
- else return NULL;
- }
-}
-
-// unequip items from equipment slot
-item_base *manager::unequip (slot *target, u_int32 *count)
-{
- // nothing to do
- if (*count == 0) return NULL;
-
- // the item we will remove from the slot
- item_base *item = target->get_item ();
-
- if (item != NULL)
- {
- // try to remove the requested number of items
- *count -= target->remove (item, *count);
-
- // let the character know when a slot was totally emptied.
- if (target->count () == 0) item->unequipped (target);
-
- // returned item(s) are no longer within a slot
- item->set_slot (NULL);
- }
-
- return item;
-}
-
-// tell manager that given slot accepts given category
-void manager::add_mapping (const std::string & slot, const std::string &
category)
-{
- std::hash_map<std::string, std::vector<std::string>,
- hash<std::string> >::iterator s = SlotCategoryMap.find (category);
-
- // does the given category already exist?
- if (s != SlotCategoryMap.end ())
- {
- // add key to existing category
- std::vector<std::string> slots = (*s).second;
- if (find (slots.begin (), slots.end (), slot) == slots.end ())
- slots.push_back (slot);
- }
- else
- {
- // create new category
- std::vector<std::string> slots (1, slot);
- SlotCategoryMap[category] = slots;
- }
-}
diff --git a/src/manager.h b/src/manager.h
deleted file mode 100644
index 91fe216..0000000
--- a/src/manager.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file manager.h
- * @author Kai Sterker <address@hidden>
- *
- * @brief Takes care of character/item issues.
- */
-
-#ifndef MANAGER_H
-#define MANAGER_H
-
-#include <vector>
-#include "str_hash.h"
-#include "item_base.h"
-
-/**
- *
- */
-class manager
-{
-public:
- /**
- * Return list of equipment slots this item fits into.
- * @param item The item whose slots to retrieve.
- * @returns List of slot ids.
- */
- const std::vector<std::string> fits (item_base *item);
-
- /**
- * Check whether a given item can be equipped in the given slot.
- * @param target An equipment slot.
- * @param item An item
- * @return \b true if item can be equipped, \b false otherwise.
- */
- bool accepts (slot* target, item_base* item);
-
- /**
- * Actually (try to) equip the given item in the given slot.
- * Replaces the item currently in the slot.
- * @param target An equipment slot.
- * @param item The item to equip.
- * @param count Number of items to add to the slot.
- * @return
- * - \c NULL if the the slot was empty and the item could be equipped.
- * - The previously equipped item if the item could be equipped.
- * \c count will contain the number of items that were equipped.
- * - The given item if equipping wasn't possible.
- */
- item_base* equip (slot *target, item_base* item, u_int32 *count);
-
- /**
- * Remove the item from the given slot.
- * @param target An equipment slot.
- * @param count Number of items to remove from the slot.
- * @return The item from the slot or \c NULL if the slot was empty.
- * \c count will contain the number of items actually removed.
- */
- item_base* unequip (slot *target, u_int32 *count);
-
- /**
- * Tell the manager that the given item category may go in the given slot.
- * @param slot The slot id.
- * @param category An item category.
- */
- static void add_mapping (const std::string & slot, const std::string &
category);
-
-private:
-#ifndef SWIG
- static std::hash_map<std::string, std::vector<std::string>,
- hash<std::string> > SlotCategoryMap;
-#endif // SWIG
-};
-
-#endif // MANAGER_H
diff --git a/src/map_event.cc b/src/map_event.cc
index 243807a..9448225 100644
--- a/src/map_event.cc
+++ b/src/map_event.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/map_event.h b/src/map_event.h
index 7eade03..ed07395 100644
--- a/src/map_event.h
+++ b/src/map_event.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/map_event_handler.cc b/src/map_event_handler.cc
index 50d9791..40e6bc2 100644
--- a/src/map_event_handler.cc
+++ b/src/map_event_handler.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/map_event_handler.h b/src/map_event_handler.h
index 4f9a4d6..419d7b1 100644
--- a/src/map_event_handler.h
+++ b/src/map_event_handler.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/mapcharacter.cc b/src/mapcharacter.cc
index 0a5367a..08679aa 100644
--- a/src/mapcharacter.cc
+++ b/src/mapcharacter.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2002 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/mapcharacter.h b/src/mapcharacter.h
index ff903b2..d3c9e5e 100644
--- a/src/mapcharacter.h
+++ b/src/mapcharacter.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapengine.cc b/src/mapengine.cc
deleted file mode 100644
index a6a7cc7..0000000
--- a/src/mapengine.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 1999/2000 The Adonthell Project
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-#include "fileops.h"
-#include "mapengine.h"
-#include "win_manager.h"
-#include "gametime.h"
-#include "character.h"
-
-#include "gamedata.h"
-
-
-mapengine * data::map_engine;
-
-mapengine::mapengine ()
-{
- mv.mapview::resize (screen::length (), screen::height ());
- letsexit = false;
- should_update_map_ = true;
-}
-
-mapengine::~mapengine ()
-{
-}
-
-void mapengine::set_mapview_schedule (string s, PyObject * args = NULL)
-{
- mv.mapview::set_schedule (s, args);
-}
-
-void mapengine::load_map (string fname)
-{
- lmap.load (fname);
- mv.mapview::attach_map (&lmap);
-}
-
-void mapengine::run ()
-{
- letsexit = false;
- mv.set_visible (true);
- mv.pack ();
- win_manager::add (&mv);
- gametime::start_action ();
-
- while (1)
- {
- mainloop ();
- if (letsexit) break;
- screen::show ();
- gametime::update ();
- }
-
- win_manager::remove (&mv);
-}
-
-void mapengine::mainloop ()
-{
- input::update ();
- for (int i = 0; i < gametime::frames_to_do (); i++)
- {
- win_manager::input_update ();
- if (should_update_map ()) lmap.update ();
- win_manager::update ();
- }
- screen::clear ();
- win_manager::draw ();
-}
-
-// fade the screen out
-void mapengine::fade_out ()
-{
- s_int16 i = 0;
-
- while (i <= 60)
- {
- mainloop ();
-
- screen::transition (i * 2);
- screen::show ();
-
- gametime::update ();
- i = i + (gametime::frames_to_do () * 2);
- }
-}
-
-// fade the screen in
-void mapengine::fade_in ()
-{
- s_int16 i = 60;
-
- while (i >= 0)
- {
- mainloop ();
-
- screen::transition (i * 2);
- screen::show ();
-
- gametime::update ();
- i = i - (gametime::frames_to_do () * 2);
- }
-}
-
-s_int8 mapengine::get_state (igzstream& file)
-{
- u_int16 nbr_of, i;
- string t;
-
- // Get the map filename
- t << file;
-
- // Load the map from the file
- lmap.get (file);
- // Load the map state (events)
- if (!lmap.get_state (file))
- return false;
-
- mv.mapview::attach_map (&lmap);
-
- // Load the mapcharacters
- nbr_of << file;
-
- for (i = 0; i < nbr_of; i++)
- {
- t << file;
- mapcharacter *mc = (mapcharacter *) data::characters[t.c_str ()];
-
- mc->set_map (&lmap);
- mc->get_state (file);
- }
-
- // Load the mapview state
- mv.mapview::get_state (file);
- mv.pack ();
- return true;
-}
-
-s_int8 mapengine::put_state (ogzstream& file)
-{
- u_int16 nbr_of, i;
-
- // Save the map filename
- string t = lmap.filename ();
- t >> file;
-
- // Save the map itself
- lmap.put (file);
- // Save the map state (events)
- lmap.put_state (file);
-
- // Save the mapcharacters and their status
- nbr_of = lmap.nbr_of_mapcharacters ();
- nbr_of >> file;
-
- for (i = 0; i < nbr_of; i++)
- {
- mapcharacter * mc = lmap.get_mapcharacter (i);
- t = mc->get_name ();
- t >> file;
- mc->put_state (file);
- }
-
- // Save the mapview state
- mv.mapview::put_state (file);
- return 0;
-}
diff --git a/src/mapobject.cc b/src/mapobject.cc
index f885e69..fea0fb0 100644
--- a/src/mapobject.cc
+++ b/src/mapobject.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapobject.h b/src/mapobject.h
index 643a440..493556c 100644
--- a/src/mapobject.h
+++ b/src/mapobject.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapsquare.cc b/src/mapsquare.cc
index d47352e..9282b8b 100644
--- a/src/mapsquare.cc
+++ b/src/mapsquare.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapsquare.h b/src/mapsquare.h
index 9ef3da4..9a66d88 100644
--- a/src/mapsquare.h
+++ b/src/mapsquare.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapsquare_walkable.cc b/src/mapsquare_walkable.cc
index dd307fc..d8b8820 100644
--- a/src/mapsquare_walkable.cc
+++ b/src/mapsquare_walkable.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/mapsquare_walkable.h b/src/mapsquare_walkable.h
index 5be927f..52943d6 100644
--- a/src/mapsquare_walkable.h
+++ b/src/mapsquare_walkable.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapview.cc b/src/mapview.cc
index d35ec2b..4cb4b52 100644
--- a/src/mapview.cc
+++ b/src/mapview.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/mapview.h b/src/mapview.h
index f431cce..fe56791 100644
--- a/src/mapview.h
+++ b/src/mapview.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/nls.cc b/src/nls.cc
index dfaa8ee..551edd0 100644
--- a/src/nls.cc
+++ b/src/nls.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2003/2016 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@@ -55,12 +59,8 @@ void nls::init (config &myconfig)
void nls::set_language (const string &language)
{
#if ENABLE_NLS
-#ifndef __BEOS__
current_lang = language.empty() ? "LANGUAGE" : "LANGUAGE=" + language;
putenv ((char *) current_lang.c_str ());
-#else
- // TODO: no putenv on BEOS, but there should be setenv
-#endif
{
// tell gettext that the language has changed
extern int _nl_msg_cat_cntr;
diff --git a/src/nls.h b/src/nls.h
index 3530557..e101429 100644
--- a/src/nls.h
+++ b/src/nls.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2016 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/path.cc b/src/path.cc
index 2db37e4..00b04d1 100644
--- a/src/path.cc
+++ b/src/path.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/path.h b/src/path.h
index cdb8ed9..53c4406 100644
--- a/src/path.h
+++ b/src/path.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/pnm.cc b/src/pnm.cc
index a3aefd2..da65b58 100644
--- a/src/pnm.cc
+++ b/src/pnm.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999 The Adonthell Project
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/pnm.h b/src/pnm.h
index 215aa0f..a669e12 100644
--- a/src/pnm.h
+++ b/src/pnm.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001 The Adonthell Project
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/prefs.cc b/src/prefs.cc
index 1f8bcbd..96708ff 100644
--- a/src/prefs.cc
+++ b/src/prefs.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2001/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/prefs.h b/src/prefs.h
index 862f4d9..a94529d 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2000/2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2000/2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/py_callback.cc b/src/py_callback.cc
index 5636f63..6bbd300 100644
--- a/src/py_callback.cc
+++ b/src/py_callback.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file py_callback.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the py_callback class.
*
diff --git a/src/py_callback.h b/src/py_callback.h
index b6ace14..2dbe30a 100644
--- a/src/py_callback.h
+++ b/src/py_callback.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PY_CALLBACK_H__
@@ -18,7 +22,7 @@
/**
* @file py_callback.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the py_callback class.
*
diff --git a/src/py_object.cc b/src/py_object.cc
index 4770aa7..a10526e 100644
--- a/src/py_object.cc
+++ b/src/py_object.cc
@@ -1,22 +1,26 @@
/*
- $Id$
-
- Copyright (C) 1999/2000/2001/2003 Kai Sterker
- Copyright (C) 2001 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ Copyright (C) 1999/2000/2001/2003 Kai Sterker
+ Copyright (C) 2001 Alexandre Courbot
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file py_object.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
* @author Alexandre Courbot <address@hidden>
*
* @brief Defines the py_object class.
diff --git a/src/py_object.h b/src/py_object.h
index 4e7b136..e8b0b75 100644
--- a/src/py_object.h
+++ b/src/py_object.h
@@ -1,22 +1,26 @@
/*
- $Id$
-
- Copyright (C) 1999/2000/2001/2003 Kai Sterker <address@hidden>
+ Copyright (C) 1999/2000/2001/2003 Kai Sterker <address@hidden>
Copyright (C) 2001 Alexandre Courbot <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file py_object.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
* @author Alexandre Courbot <address@hidden>
*
* @brief Declares the py_object class.
@@ -225,7 +229,7 @@ public:
* Returns the file name of this object. This is the name of the
* Python module containing the wrapped class.
*
- * @return fi�e name of this object.
+ * @return fi�e name of this object.
*/
std::string file_name () const
{
diff --git a/src/python_class.cc b/src/python_class.cc
index f33fcdd..fe874af 100644
--- a/src/python_class.cc
+++ b/src/python_class.cc
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file python_class.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the python class.
*
diff --git a/src/python_class.h b/src/python_class.h
index 078273b..26dce1a 100644
--- a/src/python_class.h
+++ b/src/python_class.h
@@ -1,21 +1,25 @@
/*
- $Id$
+ Copyright (C) 2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file python_class.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the python class. This file is named this way
* so it doesn't conflicts with Python.h Python's include
diff --git a/src/quest.cc b/src/quest.cc
index 5ac5431..3534d59 100644
--- a/src/quest.cc
+++ b/src/quest.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
- Copyright (C) 2000 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quest.h"
diff --git a/src/quest.h b/src/quest.h
index 1709e89..82be2d0 100644
--- a/src/quest.h
+++ b/src/quest.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
- Copyright (C) 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __QUEST_H__
diff --git a/src/screen.cc b/src/screen.cc
index 9a27bb3..b3af49a 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -1,20 +1,26 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2004 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file screen.cc
* @author Alexandre Courbot <address@hidden>
+ * @author Kai Sterker
*
* @brief Defines the screen class.
*
diff --git a/src/screen.h b/src/screen.h
index 53babd9..9905fa4 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,20 +1,26 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2004 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file screen.h
* @author Alexandre Courbot <address@hidden>
+ * @author Kai Sterker
*
* @brief Declares the screen class.
*
diff --git a/src/slot.cc b/src/slot.cc
deleted file mode 100644
index 9544585..0000000
--- a/src/slot.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file slot.cc
- * @author Kai Sterker <address@hidden>
- *
- * @brief One unit of the inventory.
- */
-
-#include "slot.h"
-#include "item_storage.h"
-
-// ctor
-slot::slot (inventory *owner, const std::string & id, const bool & equipment)
-{
- Owner = owner;
- Id = id;
- Count = 0;
- Item = NULL;
- Negated = false;
- Equipment = equipment;
-}
-
-// dtor
-slot::~slot ()
-{
- // if the slot contains item(s), delete them
- if (Item && Item->is_mutable ())
- {
- Item->set_slot (NULL);
- delete Item;
- }
-}
-
-// retrieve item(s) in slot
-item_base *slot::get_item ()
-{
- // temporarily assign slot to immutable items
- if (Item && !Item->is_mutable ()) Item->set_slot (this);
- return Item;
-}
-
-// check whether slot accepts given item
-bool slot::accepts (item_base *item)
-{
- if (!Item) return true;
- else return Item->equals (item);
-}
-
-// add item(s) to slot
-u_int32 slot::add (item_base *item, const u_int32 & count)
-{
- // nothing needs be done
- if (count == 0) return 0;
-
- // if we have an empty slot, we can just add the items
- if (!Item) Item = item;
-
- // otherwise check whether given items may go into this slot
- else
- {
- // items from same slot?
- if (this == item->get_slot ()) return 0;
-
- // item stackable?
- if (Count >= Item->max_stack ()) return count;
-
- // items of same kind?
- if (!(Item->equals (item))) return count;
-
- // actually stack mutable items
- if (item->is_mutable ()) Item->stack (item);
- }
-
- // calculate how many items will fit into the slot
- u_int32 fitting = item->max_stack () - Count;
- fitting = (fitting > count) ? count : fitting;
-
- // remove items from the inventory they came
- if (item->get_slot ())
- // make sure we don't add more items than we remove
- fitting -= item->get_slot ()->remove (item, fitting);
-
- // adjust counts
- Count += fitting;
-
- // adjust slots
- if (item->is_mutable ()) item->set_slot (this);
-
- // return number of items that weren't added
- return count - fitting;
-}
-
-// remove item(s) from slot
-u_int32 slot::remove (item_base *item, const u_int32 & count)
-{
- // nothing needs be done
- if (!item || count == 0) return 0;
-
- // in case items match, remove count items
- if (Item == item)
- {
- u_int32 remove = (Count > count) ? count : Count;
-
- // for immutable items, simply decrease the refcount
- Count -= remove;
-
- // for mutable items, also remove them from the stack
- if (Item->is_mutable ()) Item = Item->split (remove);
-
- // slot empty?
- if (Count == 0) Item = NULL;
-
- // return number of items that couldn't be removed
- return count - remove;
- }
-
- // otherwise search through the stack to remove the item
- for (item_base *i = Item; i != NULL; i = i->Next)
- if (i->Next == item)
- {
- i->Next = item->Next;
- item->Next = NULL;
- item->Slot = NULL;
- Count--;
-
- return count - 1;
- }
-
- return count;
-}
-
-// empty the slot
-void slot::clear ()
-{
- // if the slot contains mutable item(s), delete them
- if (Item && Item->is_mutable ())
- {
- Item->set_slot (NULL);
- delete Item;
- }
-
- Item = NULL;
- Count = 0;
-}
-
-// save slot to disk
-bool slot::put_state (ogzstream & file) const
-{
- // save slot attributes
- Id >> file;
- Count >> file;
- Negated >> file;
- Equipment >> file;
-
- // save the item(s) in the slot
- if (Count > 0)
- {
- Item->is_mutable () >> file;
-
- // completely save mutable items
- if (Item->is_mutable ()) Item->put_state (file);
-
- // otherwise only save unique item id
- else Item->name () >> file;
- }
-
- return true;
-}
-
-// load slot from disk
-bool slot::get_state (igzstream & file)
-{
- // get slot attributes
- Id << file;
- Count << file;
- Negated << file;
- Equipment << file;
-
- // get item(s) if any
- if (Count > 0)
- {
- bool is_mutable;
- is_mutable << file;
-
- // mutable items need to be instanciated and loaded
- if (is_mutable)
- {
- Item = new item_base (true);
- Item->get_state (file);
- Item->set_slot (this);
- }
-
- // immutable items can be retrieved from the global item storage
- else
- {
- std::string name;
- name << file;
-
- Item = item_storage::get (name);
- }
- }
-
- return true;
-}
diff --git a/src/slot.h b/src/slot.h
deleted file mode 100644
index 986fe4b..0000000
--- a/src/slot.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- $Id$
-
- Copyright (C) 2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-
-/**
- * @file slot.h
- * @author Kai Sterker <address@hidden>
- *
- * @brief One unit of the inventory.
- */
-
-#ifndef SLOT_H
-#define SLOT_H
-
-#include "fileops.h"
-
-class item_base;
-class inventory;
-
-/**
- * The %slot class may contain one item or a stack of (roughly) equal
- * items. It is used by inventories, which are basically a list of
- * slots.
- */
-class slot
-{
-public:
- /**
- * Create a new %slot with an optional id. The id can be used to
- * retrieve certain slots from the %inventory. The equipment flag
- * determines whether this %slot will be able to contain equipped items,
- * i.e. those worn or held by a %character. The manager::equip () method
- * will only accept slots with the equipment flag set to true.
- * @param owner The %inventory the %slot belongs to
- * @param id The slot's id
- * @param equipment \b true to allow equipping items in that slot
- */
- slot (inventory *owner, const string & id = "", const bool & equipment =
false);
-
- /**
- * Delete a slot.
- */
- ~slot ();
-
- /**
- * @name Item handling
- */
- //@{
- /**
- * Retrieve pointer to the item kept in this %slot. In case of an
- * immutable item, it will also adjust item_base::Slot. To check
- * whether a slot is empty, use the count() method below; it's faster.
- * @return item in this %slot, or \c NULL in case it is empty.
- */
- item_base *get_item ();
-
- /**
- * Checks whether the given item is allowed to go into this %slot.
- * This is the case when the %slot is empty, or if the items
- * already in the %slot (roughly) equal the given item.
- * @param item Item to test against.
- * @return \b true if the item may go into the %slot, \b falso otherwise
- */
- bool accepts (item_base *item);
-
- /**
- * Add an item or stack of items to this %slot. If the %slot is not
- * empty, the given item must be of roughly the same kind (i.e. have
- * the same name) as the item kept in the %slot and it must be stackable.
- * If more items are given than fit, the remaining number will be
- * returned.
- *
- * If items that are added come from another %inventory, they will be
- * removed from there automatically, as long as they fit into this %slot.
- *
- * @param item the item or stack of items to be added.
- * @param count number of items in the stack.
- * @return number of items that didn't fit into the %slot.
- */
- u_int32 add (item_base * item, const u_int32 & count = 1);
-
- /**
- * Removes the topmost item(s) from the %slot, if possible. Up to count
- * items are removed, unless there aren't as many items in the slot.
- * Note that mutable items are only removed, but not deleted.
- *
- * @param item the item to be removed from the slot.
- * @param count number of items to be removed.
- * @return number of items that could not be removed.
- */
- u_int32 remove (item_base * item, const u_int32 & count = 1);
-
- /**
- * Remove all items from the slot, no matter whether they are mutable
- * or not.
- */
- void clear ();
-
- /**
- * Retrieve the number of items in this %slot. This is the preferred
- * method to check whether a slot is empty or not, as it has much less
- * overhead than get_item() above.
- * @return number of items this %slot contains.
- */
- u_int32 count () const
- {
- return Count;
- }
- //@}
-
- /**
- * Return the inventory this slot belongs to.
- * @return inventory this slot belongs to.
- */
- inventory *owner () const
- {
- return Owner;
- }
-
- /**
- * Attribute access
- */
- //@{
- /**
- * Retrieve the slot's id.
- * @return id of the %slot.
- */
- const string & id () const
- {
- return Id;
- }
-
- /**
- * Give this %slot a new Id.
- * @param id A new identifier for this %slot.
- */
- void set_id (const string & id)
- {
- Id = id;
- }
-
- /**
- * Is that slot 'disabled'?
- * @return \b true if that is the case, \b false otherwise.
- */
- bool is_negated () const
- {
- return Negated;
- }
-
- /**
- * Disable or enable this slot. It's up to users of the slot to
- * make use of this flag.
- * @param negated \b false to enable, \b true to disable the slot.
- */
- void set_negated (const bool & negated)
- {
- Negated = negated;
- }
-
- /**
- * Is this slot meant for equipped items?
- * @return \b true if that is the case, \b false otherwise.
- */
- bool is_equipment () const
- {
- return Equipment;
- }
-
- void set_equipment (const bool & equipment)
- {
- Equipment = equipment;
- }
- //@}
-
- /**
- * @name Loading/Saving
- */
- //@{
- /**
- * Load %slot and its contents from stream.
- * @param file stream to load %slot from.
- * @return \b true if loading successful, \b false otherwise.
- */
- bool get_state (igzstream & file);
-
- /**
- * Save %slot and its contents to stream.
- * @param file stream to save %slot to.
- * @return \b true if saving successful, \b false otherwise.
- */
- bool put_state (ogzstream & file) const;
- //@}
-
-private:
-#ifndef SWIG
- /**
- * Identifier for this %slot, to retrieve it from its %inventory
- * if neccessary.
- */
- string Id;
-
- /**
- * The %inventory this %slot belongs to.
- */
- inventory *Owner;
-
- /**
- * The item(s) currently kept in this %slot.
- */
- item_base *Item;
-
- /**
- * The number of items in this %slot.
- */
- u_int32 Count;
-
- /**
- * Whether the slot is disabled.
- */
- bool Negated;
-
- /**
- * Whether this slot is for equipping items.
- */
- bool Equipment;
-#endif // SWIG
-};
-
-#endif // SLOT_H
diff --git a/src/storage.cc b/src/storage.cc
index a496290..13facee 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -1,20 +1,24 @@
/*
- $Id$
-
- Copyright (C) 2000/2001 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file storage.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Defines the storage and objects classes.
*
diff --git a/src/storage.h b/src/storage.h
index f25a357..6252278 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
- Copyright (C) 2000/2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2000/2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file storage.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the storage and objects classes.
*
diff --git a/src/str_hash.h b/src/str_hash.h
index 6d6d670..1deff42 100644
--- a/src/str_hash.h
+++ b/src/str_hash.h
@@ -1,21 +1,26 @@
/*
- $Id$
(C) Copyright 2001 Alexandre Courbot <address@hidden>
- (C) Copyright 2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ (C) Copyright 2004/2016 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
Adonthell is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
+
You should have received a copy of the GNU General Public License
- along with Adonthell; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file str_hash.h
* @author Alexandre Courbot <address@hidden>
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Declares the hash<string> type, to be able to declare
* hash_maps with strings as keys.
diff --git a/src/surface.cc b/src/surface.cc
index 3e238ec..889adee 100644
--- a/src/surface.cc
+++ b/src/surface.cc
@@ -1,20 +1,28 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2004 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file surface.cc
+ * @author Alexandre Courbot
+ * @author Kai Sterker
+ *
* Defines the surface class.
*/
diff --git a/src/surface.h b/src/surface.h
index ddcef0f..f461e36 100644
--- a/src/surface.h
+++ b/src/surface.h
@@ -1,21 +1,27 @@
/*
- $Id$
-
Copyright (C) 1999/2000/2001/2004 Alexandre Courbot
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file surface.h
* @author Alexandre Courbot <address@hidden>
+ * @author Kai Sterker
*
* @brief Declares the surface class.
*
diff --git a/src/text_bubble.cc b/src/text_bubble.cc
index d2a705c..8978d0f 100644
--- a/src/text_bubble.cc
+++ b/src/text_bubble.cc
@@ -1,22 +1,26 @@
/*
- $Id$
-
- Copyright (C) 2001/2002 Kai Sterker <address@hidden>
+ Copyright (C) 2001/2002/2016 Kai Sterker <address@hidden>
Copyright (C) 2001 Alexandre Courbot <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file text_bubble.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
* @author Alexandre Courbot <address@hidden>
*
* @brief Defines the text_bubble class.
diff --git a/src/text_bubble.h b/src/text_bubble.h
index a131124..f82ad04 100644
--- a/src/text_bubble.h
+++ b/src/text_bubble.h
@@ -1,22 +1,26 @@
/*
- $Id$
-
- Copyright (C) 2001 Kai Sterker <address@hidden>
+ Copyright (C) 2001 Kai Sterker <address@hidden>
Copyright (C) 2001 Alexandre Courbot <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file text_bubble.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
* @author Alexandre Courbot <address@hidden>
*
* @brief Declares the text_bubble class.
diff --git a/src/time_event.cc b/src/time_event.cc
index 698e823..3a4c3df 100644
--- a/src/time_event.cc
+++ b/src/time_event.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2003/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Adonthell is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Adonthell; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/time_event.h b/src/time_event.h
index 15a725c..053222d 100644
--- a/src/time_event.h
+++ b/src/time_event.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/time_event_handler.cc b/src/time_event_handler.cc
index 4e77228..b268b64 100644
--- a/src/time_event_handler.cc
+++ b/src/time_event_handler.cc
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/time_event_handler.h b/src/time_event_handler.h
index 3323911..ce6122f 100644
--- a/src/time_event_handler.h
+++ b/src/time_event_handler.h
@@ -1,15 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/cfg_data.cc b/src/tools/dlgedit/cfg_data.cc
index 13c3ad4..d07beb6 100644
--- a/src/tools/dlgedit/cfg_data.cc
+++ b/src/tools/dlgedit/cfg_data.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/cfg_data.h b/src/tools/dlgedit/cfg_data.h
index 3beb679..0d21004 100644
--- a/src/tools/dlgedit/cfg_data.h
+++ b/src/tools/dlgedit/cfg_data.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/cfg_io.cc b/src/tools/dlgedit/cfg_io.cc
index d4080a5..703a95d 100644
--- a/src/tools/dlgedit/cfg_io.cc
+++ b/src/tools/dlgedit/cfg_io.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/cfg_io.h b/src/tools/dlgedit/cfg_io.h
index 74375c8..5dfb734 100644
--- a/src/tools/dlgedit/cfg_io.h
+++ b/src/tools/dlgedit/cfg_io.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/cfg_project.cc b/src/tools/dlgedit/cfg_project.cc
index 0aeedd9..b70b7bb 100644
--- a/src/tools/dlgedit/cfg_project.cc
+++ b/src/tools/dlgedit/cfg_project.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/cfg_project.h b/src/tools/dlgedit/cfg_project.h
index cedb724..7ac3f35 100644
--- a/src/tools/dlgedit/cfg_project.h
+++ b/src/tools/dlgedit/cfg_project.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_arrow.cc b/src/tools/dlgedit/dlg_arrow.cc
index 835156c..4a69387 100644
--- a/src/tools/dlgedit/dlg_arrow.cc
+++ b/src/tools/dlgedit/dlg_arrow.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_arrow.h b/src/tools/dlgedit/dlg_arrow.h
index 733f5b3..2549b7d 100644
--- a/src/tools/dlgedit/dlg_arrow.h
+++ b/src/tools/dlgedit/dlg_arrow.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_circle.cc b/src/tools/dlgedit/dlg_circle.cc
index 40fa7aa..8ea91f0 100644
--- a/src/tools/dlgedit/dlg_circle.cc
+++ b/src/tools/dlgedit/dlg_circle.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_circle.h b/src/tools/dlgedit/dlg_circle.h
index e9e20fe..c875133 100644
--- a/src/tools/dlgedit/dlg_circle.h
+++ b/src/tools/dlgedit/dlg_circle.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_circle_entry.cc
b/src/tools/dlgedit/dlg_circle_entry.cc
index 628a662..8057906 100644
--- a/src/tools/dlgedit/dlg_circle_entry.cc
+++ b/src/tools/dlgedit/dlg_circle_entry.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_circle_entry.h
b/src/tools/dlgedit/dlg_circle_entry.h
index 4d8f3f4..5c32df6 100644
--- a/src/tools/dlgedit/dlg_circle_entry.h
+++ b/src/tools/dlgedit/dlg_circle_entry.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_cmdline.cc b/src/tools/dlgedit/dlg_cmdline.cc
index 368f349..5abbc51 100644
--- a/src/tools/dlgedit/dlg_cmdline.cc
+++ b/src/tools/dlgedit/dlg_cmdline.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_cmdline.h b/src/tools/dlgedit/dlg_cmdline.h
index aabf0ec..0de0ddb 100644
--- a/src/tools/dlgedit/dlg_cmdline.h
+++ b/src/tools/dlgedit/dlg_cmdline.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_compiler.cc
b/src/tools/dlgedit/dlg_compiler.cc
index dddbb75..218e04d 100644
--- a/src/tools/dlgedit/dlg_compiler.cc
+++ b/src/tools/dlgedit/dlg_compiler.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2006 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2006 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_compiler.h b/src/tools/dlgedit/dlg_compiler.h
index 71f31dd..0f74272 100644
--- a/src/tools/dlgedit/dlg_compiler.h
+++ b/src/tools/dlgedit/dlg_compiler.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_module.cc b/src/tools/dlgedit/dlg_module.cc
index f2731f8..968e8e7 100644
--- a/src/tools/dlgedit/dlg_module.cc
+++ b/src/tools/dlgedit/dlg_module.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_module.h b/src/tools/dlgedit/dlg_module.h
index fb478c4..28f323f 100644
--- a/src/tools/dlgedit/dlg_module.h
+++ b/src/tools/dlgedit/dlg_module.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_module_entry.cc
b/src/tools/dlgedit/dlg_module_entry.cc
index 09636c4..16b423a 100644
--- a/src/tools/dlgedit/dlg_module_entry.cc
+++ b/src/tools/dlgedit/dlg_module_entry.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_module_entry.h
b/src/tools/dlgedit/dlg_module_entry.h
index 7458d7d..99bba03 100644
--- a/src/tools/dlgedit/dlg_module_entry.h
+++ b/src/tools/dlgedit/dlg_module_entry.h
@@ -1,7 +1,7 @@
/*
$Id$
- Copyright (C) 2002 Kai Sterker <address@hidden>
+ Copyright (C) 2002 Kai Sterker <address@hidden>
Part of the Adonthell Project http://adonthell.linuxgames.com
Dlgedit is free software; you can redistribute it and/or modify
diff --git a/src/tools/dlgedit/dlg_mover.cc b/src/tools/dlgedit/dlg_mover.cc
index f7e91bc..397fbc6 100644
--- a/src/tools/dlgedit/dlg_mover.cc
+++ b/src/tools/dlgedit/dlg_mover.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_mover.h b/src/tools/dlgedit/dlg_mover.h
index 1cc0a27..86e403a 100644
--- a/src/tools/dlgedit/dlg_mover.h
+++ b/src/tools/dlgedit/dlg_mover.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_node.cc b/src/tools/dlgedit/dlg_node.cc
index ba387d5..19aa67f 100644
--- a/src/tools/dlgedit/dlg_node.cc
+++ b/src/tools/dlgedit/dlg_node.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_node.h b/src/tools/dlgedit/dlg_node.h
index 98faa56..5aed525 100644
--- a/src/tools/dlgedit/dlg_node.h
+++ b/src/tools/dlgedit/dlg_node.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_node_gfx.cc
b/src/tools/dlgedit/dlg_node_gfx.cc
index 8d7feba..fca25b0 100644
--- a/src/tools/dlgedit/dlg_node_gfx.cc
+++ b/src/tools/dlgedit/dlg_node_gfx.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_node_gfx.h b/src/tools/dlgedit/dlg_node_gfx.h
index 3734f66..1b7c69b 100644
--- a/src/tools/dlgedit/dlg_node_gfx.h
+++ b/src/tools/dlgedit/dlg_node_gfx.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_point.cc b/src/tools/dlgedit/dlg_point.cc
index b5bc4c5..573bee6 100644
--- a/src/tools/dlgedit/dlg_point.cc
+++ b/src/tools/dlgedit/dlg_point.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_point.h b/src/tools/dlgedit/dlg_point.h
index d7bb15a..0a579d3 100644
--- a/src/tools/dlgedit/dlg_point.h
+++ b/src/tools/dlgedit/dlg_point.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_rect.cc b/src/tools/dlgedit/dlg_rect.cc
index aa7e3ce..0ef04ab 100644
--- a/src/tools/dlgedit/dlg_rect.cc
+++ b/src/tools/dlgedit/dlg_rect.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_rect.h b/src/tools/dlgedit/dlg_rect.h
index 49cdee4..95c401e 100644
--- a/src/tools/dlgedit/dlg_rect.h
+++ b/src/tools/dlgedit/dlg_rect.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/dlg_types.h b/src/tools/dlgedit/dlg_types.h
index e462008..6e3f2f7 100644
--- a/src/tools/dlgedit/dlg_types.h
+++ b/src/tools/dlgedit/dlg_types.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_circle.cc b/src/tools/dlgedit/gui_circle.cc
index 8c703ec..a6274b6 100644
--- a/src/tools/dlgedit/gui_circle.cc
+++ b/src/tools/dlgedit/gui_circle.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2004/2007 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2004/2007 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
diff --git a/src/tools/dlgedit/gui_circle.h b/src/tools/dlgedit/gui_circle.h
index 6c1de7e..d4aee5d 100644
--- a/src/tools/dlgedit/gui_circle.h
+++ b/src/tools/dlgedit/gui_circle.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_circle_events.cc
b/src/tools/dlgedit/gui_circle_events.cc
index 11c1999..7d81312 100644
--- a/src/tools/dlgedit/gui_circle_events.cc
+++ b/src/tools/dlgedit/gui_circle_events.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_circle_events.h
b/src/tools/dlgedit/gui_circle_events.h
index f65885a..3d6c951 100644
--- a/src/tools/dlgedit/gui_circle_events.h
+++ b/src/tools/dlgedit/gui_circle_events.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_code.cc b/src/tools/dlgedit/gui_code.cc
index db8931d..1986f63 100644
--- a/src/tools/dlgedit/gui_code.cc
+++ b/src/tools/dlgedit/gui_code.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
#include "gui_code.h"
diff --git a/src/tools/dlgedit/gui_code.h b/src/tools/dlgedit/gui_code.h
index 20d2040..713aba0 100644
--- a/src/tools/dlgedit/gui_code.h
+++ b/src/tools/dlgedit/gui_code.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_dlgedit.cc b/src/tools/dlgedit/gui_dlgedit.cc
index fe11003..3a0e404 100644
--- a/src/tools/dlgedit/gui_dlgedit.cc
+++ b/src/tools/dlgedit/gui_dlgedit.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_dlgedit.h b/src/tools/dlgedit/gui_dlgedit.h
index acf49b8..c79c1be 100644
--- a/src/tools/dlgedit/gui_dlgedit.h
+++ b/src/tools/dlgedit/gui_dlgedit.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_dlgedit_events.cc
b/src/tools/dlgedit/gui_dlgedit_events.cc
index 7843695..2c86eef 100644
--- a/src/tools/dlgedit/gui_dlgedit_events.cc
+++ b/src/tools/dlgedit/gui_dlgedit_events.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 1999/2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 1999/2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_dlgedit_events.h
b/src/tools/dlgedit/gui_dlgedit_events.h
index c29cdeb..1c305e8 100644
--- a/src/tools/dlgedit/gui_dlgedit_events.h
+++ b/src/tools/dlgedit/gui_dlgedit_events.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 1999/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 1999/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_edit.cc b/src/tools/dlgedit/gui_edit.cc
index 8e692b8..93d19dc 100644
--- a/src/tools/dlgedit/gui_edit.cc
+++ b/src/tools/dlgedit/gui_edit.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_edit.h b/src/tools/dlgedit/gui_edit.h
index 61dd491..a490c7d 100644
--- a/src/tools/dlgedit/gui_edit.h
+++ b/src/tools/dlgedit/gui_edit.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_error.cc b/src/tools/dlgedit/gui_error.cc
index 91915f7..4f2ee31 100644
--- a/src/tools/dlgedit/gui_error.cc
+++ b/src/tools/dlgedit/gui_error.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_error.h b/src/tools/dlgedit/gui_error.h
index 7255941..37454ad 100644
--- a/src/tools/dlgedit/gui_error.h
+++ b/src/tools/dlgedit/gui_error.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_file.cc b/src/tools/dlgedit/gui_file.cc
index 85b0529..5001283 100644
--- a/src/tools/dlgedit/gui_file.cc
+++ b/src/tools/dlgedit/gui_file.cc
@@ -1,22 +1,19 @@
/*
- $Id$
+ Copyright (C) 2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- Copyright (C) 2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- The Adonthell Tools are free software; you can redistribute them and/or
modify
- them under the terms of the GNU General Public License as published by
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- The Adonthell Tools are distributed in the hope that they will be useful,
+ Dlgedit is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_file.h b/src/tools/dlgedit/gui_file.h
index 66e2a01..79778c8 100644
--- a/src/tools/dlgedit/gui_file.h
+++ b/src/tools/dlgedit/gui_file.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_graph.cc b/src/tools/dlgedit/gui_graph.cc
index 40b5a59..e164905 100644
--- a/src/tools/dlgedit/gui_graph.cc
+++ b/src/tools/dlgedit/gui_graph.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_graph.h b/src/tools/dlgedit/gui_graph.h
index 31b4584..1547454 100644
--- a/src/tools/dlgedit/gui_graph.h
+++ b/src/tools/dlgedit/gui_graph.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_graph_events.cc
b/src/tools/dlgedit/gui_graph_events.cc
index 5d440a5..c2ff87a 100644
--- a/src/tools/dlgedit/gui_graph_events.cc
+++ b/src/tools/dlgedit/gui_graph_events.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_graph_events.h
b/src/tools/dlgedit/gui_graph_events.h
index 018f3e4..0434105 100644
--- a/src/tools/dlgedit/gui_graph_events.h
+++ b/src/tools/dlgedit/gui_graph_events.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_list.cc b/src/tools/dlgedit/gui_list.cc
index a4c20d5..c525f06 100644
--- a/src/tools/dlgedit/gui_list.cc
+++ b/src/tools/dlgedit/gui_list.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_list.h b/src/tools/dlgedit/gui_list.h
index 3644613..67e9da5 100644
--- a/src/tools/dlgedit/gui_list.h
+++ b/src/tools/dlgedit/gui_list.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_list_events.cc
b/src/tools/dlgedit/gui_list_events.cc
index f4011fc..5827897 100644
--- a/src/tools/dlgedit/gui_list_events.cc
+++ b/src/tools/dlgedit/gui_list_events.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_list_events.h
b/src/tools/dlgedit/gui_list_events.h
index 7c64ec8..84b2598 100644
--- a/src/tools/dlgedit/gui_list_events.h
+++ b/src/tools/dlgedit/gui_list_events.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_messages.cc
b/src/tools/dlgedit/gui_messages.cc
index 2d2f10a..5035825 100644
--- a/src/tools/dlgedit/gui_messages.cc
+++ b/src/tools/dlgedit/gui_messages.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_messages.h b/src/tools/dlgedit/gui_messages.h
index ddcb977..28bac2d 100644
--- a/src/tools/dlgedit/gui_messages.h
+++ b/src/tools/dlgedit/gui_messages.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_modal_dialog.cc
b/src/tools/dlgedit/gui_modal_dialog.cc
index 99c125c..d6516bd 100644
--- a/src/tools/dlgedit/gui_modal_dialog.cc
+++ b/src/tools/dlgedit/gui_modal_dialog.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2007 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2007 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_modal_dialog.h
b/src/tools/dlgedit/gui_modal_dialog.h
index 822502d..9b2f055 100644
--- a/src/tools/dlgedit/gui_modal_dialog.h
+++ b/src/tools/dlgedit/gui_modal_dialog.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_recent_files.cc
b/src/tools/dlgedit/gui_recent_files.cc
index 3b1a54a..f516bd7 100644
--- a/src/tools/dlgedit/gui_recent_files.cc
+++ b/src/tools/dlgedit/gui_recent_files.cc
@@ -1,21 +1,20 @@
/*
- Copyright (C) 2011 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Adonthell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Adonthell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Adonthell; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ Copyright (C) 2011 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
+*/
/**
* @file common/gui_recent_files.cc
diff --git a/src/tools/dlgedit/gui_recent_files.h
b/src/tools/dlgedit/gui_recent_files.h
index a93f3e6..52651cd 100644
--- a/src/tools/dlgedit/gui_recent_files.h
+++ b/src/tools/dlgedit/gui_recent_files.h
@@ -1,20 +1,19 @@
/*
- Copyright (C) 2011 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Adonthell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Adonthell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Adonthell; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2011 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_resources.cc
b/src/tools/dlgedit/gui_resources.cc
index 9013bac..4e51ed3 100644
--- a/src/tools/dlgedit/gui_resources.cc
+++ b/src/tools/dlgedit/gui_resources.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc->, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_resources.h
b/src/tools/dlgedit/gui_resources.h
index 89242e5..d768fd9 100644
--- a/src/tools/dlgedit/gui_resources.h
+++ b/src/tools/dlgedit/gui_resources.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_scrollable.cc
b/src/tools/dlgedit/gui_scrollable.cc
index 6d2f293..49ed8ee 100644
--- a/src/tools/dlgedit/gui_scrollable.cc
+++ b/src/tools/dlgedit/gui_scrollable.cc
@@ -1,22 +1,19 @@
/*
- $Id$
-
- Copyright (C) 2009 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Dlgedit is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Dlgedit is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2009 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_scrollable.h
b/src/tools/dlgedit/gui_scrollable.h
index d5c101f..31af106 100644
--- a/src/tools/dlgedit/gui_scrollable.h
+++ b/src/tools/dlgedit/gui_scrollable.h
@@ -1,22 +1,19 @@
/*
- $Id$
-
- Copyright (C) 2009 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Dlgedit is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Dlgedit is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2009 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_settings.cc
b/src/tools/dlgedit/gui_settings.cc
index 81aed54..22f36eb 100644
--- a/src/tools/dlgedit/gui_settings.cc
+++ b/src/tools/dlgedit/gui_settings.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003/2004 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003/2004 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_settings.h b/src/tools/dlgedit/gui_settings.h
index 23f26e3..895a25b 100644
--- a/src/tools/dlgedit/gui_settings.h
+++ b/src/tools/dlgedit/gui_settings.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_tooltip.cc b/src/tools/dlgedit/gui_tooltip.cc
index e94e9d0..5b04ac5 100644
--- a/src/tools/dlgedit/gui_tooltip.cc
+++ b/src/tools/dlgedit/gui_tooltip.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_tooltip.h b/src/tools/dlgedit/gui_tooltip.h
index a605c95..17207d3 100644
--- a/src/tools/dlgedit/gui_tooltip.h
+++ b/src/tools/dlgedit/gui_tooltip.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_tree.cc b/src/tools/dlgedit/gui_tree.cc
index 9f29d08..c379e53 100644
--- a/src/tools/dlgedit/gui_tree.cc
+++ b/src/tools/dlgedit/gui_tree.cc
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/gui_tree.h b/src/tools/dlgedit/gui_tree.h
index 647bece..cae87f8 100644
--- a/src/tools/dlgedit/gui_tree.h
+++ b/src/tools/dlgedit/gui_tree.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002/2003 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/kb_traverse.cc b/src/tools/dlgedit/kb_traverse.cc
index e845e0c..d7dd1ce 100644
--- a/src/tools/dlgedit/kb_traverse.cc
+++ b/src/tools/dlgedit/kb_traverse.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/kb_traverse.h b/src/tools/dlgedit/kb_traverse.h
index 9974e9b..b4b8dca 100644
--- a/src/tools/dlgedit/kb_traverse.h
+++ b/src/tools/dlgedit/kb_traverse.h
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/loadcfg.l b/src/tools/dlgedit/loadcfg.l
index 3af9cb5..910e6ca 100644
--- a/src/tools/dlgedit/loadcfg.l
+++ b/src/tools/dlgedit/loadcfg.l
@@ -1,16 +1,20 @@
%{
/*
- $Id$
-
Copyright (C) 2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
#include <math.h>
diff --git a/src/tools/dlgedit/loadlg.l b/src/tools/dlgedit/loadlg.l
index 390efee..dae2c3c 100644
--- a/src/tools/dlgedit/loadlg.l
+++ b/src/tools/dlgedit/loadlg.l
@@ -1,16 +1,20 @@
%{
/*
- $Id$
-
Copyright (C) 2000/2002/2003 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details.
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
#include <math.h>
diff --git a/src/tools/dlgedit/main.cc b/src/tools/dlgedit/main.cc
index 83835f2..0d97c8f 100644
--- a/src/tools/dlgedit/main.cc
+++ b/src/tools/dlgedit/main.cc
@@ -1,8 +1,6 @@
/*
- $Id$
-
- Copyright (C) 1999/2000/2001/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Copyright (C) 1999/2000/2001/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
Dlgedit is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Dlgedit; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/util.cc b/src/tools/dlgedit/util.cc
index da683bc..8a205a8 100644
--- a/src/tools/dlgedit/util.cc
+++ b/src/tools/dlgedit/util.cc
@@ -1,20 +1,19 @@
/*
- Copyright (C) 2009/2010 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Adonthell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Adonthell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Adonthell; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2009/2010 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/tools/dlgedit/util.h b/src/tools/dlgedit/util.h
index 00115ae..0a19c76 100644
--- a/src/tools/dlgedit/util.h
+++ b/src/tools/dlgedit/util.h
@@ -1,20 +1,19 @@
/*
- Copyright (C) 2009/2010 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- Adonthell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Adonthell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Adonthell; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2009/2010 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Dlgedit is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Dlgedit is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Dlgedit. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/types.h b/src/types.h
index ec00f5c..ccbf5c7 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,13 +1,19 @@
-// $Id$
/*
Copyright (C) 1999/2000/2001 Alexandre Courbot.
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
- See the COPYING file for more details.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -20,7 +26,7 @@
#ifndef TYPES_H__
#define TYPES_H__
-#include <SDL2/SDL.h>
+#include <SDL.h>
// We should put ifdefs here to put the correct int values accordingly to the
system type
diff --git a/src/win_background.cc b/src/win_background.cc
index fd3dfe3..5d4636e 100644
--- a/src/win_background.cc
+++ b/src/win_background.cc
@@ -1,14 +1,21 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include <string.h>
#include "win_theme.h"
#include "win_background.h"
diff --git a/src/win_background.h b/src/win_background.h
index e007dff..9bc9484 100644
--- a/src/win_background.h
+++ b/src/win_background.h
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_BACKGROUND_H_
diff --git a/src/win_base.cc b/src/win_base.cc
index 4343d6b..26b02a1 100644
--- a/src/win_base.cc
+++ b/src/win_base.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000, 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/win_base.h b/src/win_base.h
index 5a4dd7c..636543b 100644
--- a/src/win_base.h
+++ b/src/win_base.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
(C) Copyright 2000, 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file win_base.h
- * @author Vennin Jo�l <address@hidden>
+ * @author Vennin Jo�l <address@hidden>
*
* brief Declares the win_bases class.
*
diff --git a/src/win_border.cc b/src/win_border.cc
index ae3b801..fd2bb42 100644
--- a/src/win_border.cc
+++ b/src/win_border.cc
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_theme.h"
diff --git a/src/win_border.h b/src/win_border.h
index 68db03d..d7984b7 100644
--- a/src/win_border.h
+++ b/src/win_border.h
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_BORDER_H_
diff --git a/src/win_container.cc b/src/win_container.cc
index 29be2d6..a094eca 100644
--- a/src/win_container.cc
+++ b/src/win_container.cc
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/win_container.h b/src/win_container.h
index 2a5600e..a2a7fca 100644
--- a/src/win_container.h
+++ b/src/win_container.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WIN_CONTAINER_H_
diff --git a/src/win_event.cc b/src/win_event.cc
index ad40c98..9fd717d 100644
--- a/src/win_event.cc
+++ b/src/win_event.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/win_event.h b/src/win_event.h
index 8ebed9e..0f3df2d 100644
--- a/src/win_event.h
+++ b/src/win_event.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000, 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WIN_EVENT_H_
diff --git a/src/win_font.cc b/src/win_font.cc
index a4cad77..f4247c0 100644
--- a/src/win_font.cc
+++ b/src/win_font.cc
@@ -1,14 +1,19 @@
/*
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_font.h"
diff --git a/src/win_font.h b/src/win_font.h
index 1b3a504..9a5deff 100644
--- a/src/win_font.h
+++ b/src/win_font.h
@@ -1,13 +1,19 @@
/*
- (C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ (C) Copyright 2000 Joel Vennin
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WIN_FONT_H_
diff --git a/src/win_image.h b/src/win_image.h
index 2caaed2..39c8e3e 100644
--- a/src/win_image.h
+++ b/src/win_image.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_IMAGE_H_
diff --git a/src/win_keys.cc b/src/win_keys.cc
index d973fe2..d28dcab 100644
--- a/src/win_keys.cc
+++ b/src/win_keys.cc
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000, 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_keys.h"
diff --git a/src/win_keys.h b/src/win_keys.h
index d7417f9..e44cbba 100644
--- a/src/win_keys.h
+++ b/src/win_keys.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000, 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WIN_KEYS_H_
diff --git a/src/win_label.h b/src/win_label.h
index 1bdf6c0..9e2fc76 100644
--- a/src/win_label.h
+++ b/src/win_label.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_LABEL_H_
diff --git a/src/win_manager.cc b/src/win_manager.cc
index c4330ba..80b0e44 100644
--- a/src/win_manager.cc
+++ b/src/win_manager.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/win_manager.h b/src/win_manager.h
index 547fafd..d094018 100644
--- a/src/win_manager.h
+++ b/src/win_manager.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001/2004 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/src/win_mapview.h b/src/win_mapview.h
index f608a36..e3af35d 100644
--- a/src/win_mapview.h
+++ b/src/win_mapview.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_MAPVIEW_H_
diff --git a/src/win_object.h b/src/win_object.h
index 995fd05..91f6f48 100644
--- a/src/win_object.h
+++ b/src/win_object.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000, 2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/src/win_scroll.cc b/src/win_scroll.cc
index d1e50dd..dd8c466 100644
--- a/src/win_scroll.cc
+++ b/src/win_scroll.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_scroll.h"
diff --git a/src/win_scroll.h b/src/win_scroll.h
index a865b2c..9501893 100644
--- a/src/win_scroll.h
+++ b/src/win_scroll.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_SCROLLED_H
diff --git a/src/win_scrollbar.cc b/src/win_scrollbar.cc
index 7594c67..e17f80f 100644
--- a/src/win_scrollbar.cc
+++ b/src/win_scrollbar.cc
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_theme.h"
diff --git a/src/win_scrollbar.h b/src/win_scrollbar.h
index 64fdafe..1fc6b92 100644
--- a/src/win_scrollbar.h
+++ b/src/win_scrollbar.h
@@ -1,13 +1,19 @@
/*
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_SCROLLBAR_H_
diff --git a/src/win_select.cc b/src/win_select.cc
index 8442892..7a97cec 100644
--- a/src/win_select.cc
+++ b/src/win_select.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT AN Y WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_select.h"
diff --git a/src/win_select.h b/src/win_select.h
index b4a8628..9832fa8 100644
--- a/src/win_select.h
+++ b/src/win_select.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WIN_SELECT_H_
diff --git a/src/win_theme.cc b/src/win_theme.cc
index 7b58565..47bbe3c 100644
--- a/src/win_theme.cc
+++ b/src/win_theme.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include "win_theme.h"
diff --git a/src/win_theme.h b/src/win_theme.h
index 3690146..01a8ee1 100644
--- a/src/win_theme.h
+++ b/src/win_theme.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WIN_THEME_H_
diff --git a/src/win_ttf.cc b/src/win_ttf.cc
index 240dbc7..bb92511 100644
--- a/src/win_ttf.cc
+++ b/src/win_ttf.cc
@@ -1,15 +1,19 @@
/*
- $Id$
-
- (C) Copyright 2004 Kai Sterker
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ (C) Copyright 2004/2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/src/win_ttf.h b/src/win_ttf.h
index df0b0ca..e412c80 100644
--- a/src/win_ttf.h
+++ b/src/win_ttf.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
- (C) Copyright 2004 Kai Sterker
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ (C) Copyright 2004/2016 Kai Sterker
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- See the COPYING file for more details
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_TTF_H
#define WIN_TTF_H
-#include <SDL2/SDL_ttf.h>
+#include <SDL_ttf.h>
#include "win_font.h"
class win_ttf : public win_font
diff --git a/src/win_types.h b/src/win_types.h
index fd7dd35..da5727a 100644
--- a/src/win_types.h
+++ b/src/win_types.h
@@ -1,21 +1,25 @@
/*
- $Id$
-
(C) Copyright 2000 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TYPES_WIN_H_
#define TYPES_WIN_H_
-#include <SDL2/SDL_keycode.h>
+#include <SDL_keycode.h>
#define WIN_NB_TABLE_CHAR 127
#define WIN_TEXT_MAX_LENGTH 5000
diff --git a/src/win_wrappers.h b/src/win_wrappers.h
index b10cccf..b294693 100644
--- a/src/win_wrappers.h
+++ b/src/win_wrappers.h
@@ -1,4 +1,20 @@
-
+/*
+ (C) Copyright 2000 Joel Vennin
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
+*/
/*
%include "win_font.h"
%include "win_theme.h"
diff --git a/src/win_write.h b/src/win_write.h
index e7adef2..99ffab4 100644
--- a/src/win_write.h
+++ b/src/win_write.h
@@ -1,15 +1,19 @@
/*
- $Id$
-
(C) Copyright 2000/2001 Joel Vennin
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WIN_WRITE_H_
diff --git a/src/window.h b/src/window.h
index edf1a5c..d09a0de 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,3 +1,21 @@
+/*
+ (C) Copyright 2000 Joel Vennin
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
+
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#include "win_label.h"
#include "win_write.h"
#include "win_image.h"
diff --git a/src/yarg.cc b/src/yarg.cc
index 418cb30..99e5a94 100644
--- a/src/yarg.cc
+++ b/src/yarg.cc
@@ -1,20 +1,24 @@
/*
- $Id$
+ (C) Copyright 1998/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- (C) Copyright 1998/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file yarg.cc
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Yet Another Random Number Genarator.
*
diff --git a/src/yarg.h b/src/yarg.h
index 94e1c3f..cb166c2 100644
--- a/src/yarg.h
+++ b/src/yarg.h
@@ -1,20 +1,24 @@
/*
- $Id$
+ (C) Copyright 1998/2002 Kai Sterker <address@hidden>
+ Part of the Adonthell Project <http://adonthell.nongnu.org>
- (C) Copyright 1998/2002 Kai Sterker <address@hidden>
- Part of the Adonthell Project http://adonthell.linuxgames.com
+ Adonthell is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ Adonthell is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- See the COPYING file for more details
+ You should have received a copy of the GNU General Public License
+ along with Adonthell. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file yarg.h
- * @author Kai Sterker <address@hidden>
+ * @author Kai Sterker <address@hidden>
*
* @brief Yet Another Random Number Genarator.
*
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [adonthell-commits] master 614df1d: UPDATED GPL headers,
Kai Sterker <=