changed license to GPLv3 only; sorry, no trust to FSF anymore

[d2df-sdl.git] / src / game / g_holmes_cmd.inc

diff --git a/src/game/g_holmes_cmd.inc b/src/game/g_holmes_cmd.inc
index 63b0ae55a83587d0e1118b97633e2053ed3185d2..93f030194db1e09cd09780573f2ddf3865ea8aff 100644 (file)
--- a/src/game/g_holmes_cmd.inc
+++ b/src/game/g_holmes_cmd.inc
@@ -1,9 +1,8 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * This program 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 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,7 +43,7 @@ type
     function cmdName (): AnsiString;
   end;
 
-  TCmdHash = specialize THashBase<AnsiString, PHolmesCommand>;
+  TCmdHash = specialize THashBase<AnsiString, PHolmesCommand, THashKeyStr>;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -110,12 +109,9 @@ end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-function ansistrEquCB (constref a, b: AnsiString): Boolean; begin result := (a = b); end;
-function ansistrHashCB (constref a: AnsiString): LongWord; begin if (Length(a) > 0) then result := fnvHash(PChar(a)^, Length(a)) else result := 0; end;
-
 function hashNewCommand (): TCmdHash;
 begin
-  result := TCmdHash.Create(ansistrHashCB, ansistrEquCB);
+  result := TCmdHash.Create();
 end;
 
 
@@ -283,7 +279,7 @@ begin
 end;
 
 
-function keybindExecute (var ev: THKeyEvent): Boolean;
+function keybindExecute (var ev: TFUIEvent): Boolean;
 var
   f: Integer;
 begin
@@ -301,7 +297,7 @@ begin
 end;
 
 
-function msbindExecute (var ev: THMouseEvent): Boolean;
+function msbindExecute (var ev: TFUIEvent): Boolean;
 var
   f: Integer;
 begin